Merge branch 'develop_master' into 'FOTON'
Develop master See merge request LiuChao/foton-slrs-system-rest!305
This commit is contained in:
+6
-1
@@ -85,7 +85,12 @@
|
|||||||
<select id="getWarningDate" resultType="com.adc.da.slrs.sarStandWarning.entity.WarningDate">
|
<select id="getWarningDate" resultType="com.adc.da.slrs.sarStandWarning.entity.WarningDate">
|
||||||
|
|
||||||
|
|
||||||
SELECT lawId,timeName,DATE_FORMAT(SSRQ,'%Y-%m-%d') as SSRQ FROM
|
SELECT
|
||||||
|
lawId,
|
||||||
|
itemId,
|
||||||
|
timeName,
|
||||||
|
DATE_FORMAT(SSRQ, '%Y-%m-%d') AS SSRQ
|
||||||
|
FROM
|
||||||
(
|
(
|
||||||
select attr.STAND_ID as lawId,'-1' as itemId,'SSRQ' as timeName,
|
select attr.STAND_ID as lawId,'-1' as itemId,'SSRQ' as timeName,
|
||||||
substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ
|
substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ
|
||||||
|
|||||||
Reference in New Issue
Block a user