Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!346

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml

@@ -29,7 +29,7 @@
         FROM
         warning_date
         WHERE
-        DATE_FORMAT(SSRQ, '%Y-%m-%d') > DATE_FORMAT(now(), '%Y-%m-%d')
+        DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d')
 
         )
         OR
@@ -39,7 +39,7 @@
         FROM
         warning_date
         WHERE
-        DATE_FORMAT(SSRQ, '%Y-%m-%d') > DATE_FORMAT(now(), '%Y-%m-%d')
+        DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d')
         )
     </delete>
 
@@ -79,12 +79,15 @@
 
     <select id="getWarningDate" resultType="com.adc.da.slrs.sarStandWarning.entity.WarningDate">
 
+select A.* from
 
-
+(
         select attr.STAND_ID as lawId,'-1' as itemId,'SSRQ' as timeName,
         SSRQ as SSRQ
         from sar_stand_attr_info attr
         WHERE
+
+
         SSRQ REGEXP #{termStr}
 
         UNION ALL
@@ -119,6 +122,10 @@
         from sar_stand_items item
            WHERE
             XCXSSRQ REGEXP #{termStr}
+            ) AS A
+            left join sar_standards_info as sarInfo
+            on sarInfo.id=A.lawId
+            where sarInfo.valid_flag = '0'
 
 
     </select>