Merge branch 'develop_master' into 'FOTON'

Develop master See merge request LiuChao/foton-slrs-system-rest!305
2021-12-20 20:29:41 +08:00
parent 820bc2c519 999f277c13
commit 4bc1c92df8
1 changed files with 6 additions and 1 deletions
@@ -85,7 +85,12 @@
    <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,
        substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ