Merge remote-tracking branch 'origin/develop_master' into develop_master

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

@@ -4,7 +4,7 @@
 
     <insert id="ignoreInsert" parameterType="java.util.LinkedList">
 
-        REPLACE  INTO sar_stand_warning (ID,STAND_ID,ITEMS_ID,POLICY_ID,MARK,POWER)
+        REPLACE  INTO sar_stand_warning (ID,STAND_ID,ITEM_ID,POLICY_ID,MARK,POWER)
         VALUES
         <if test="warningEOS !=null and warningEOS.size()!=0">
             <foreach collection="warningEOS" item="item" index="index"  separator=",">
@@ -21,26 +21,11 @@
     </insert>
     <delete id="autoCancelWarning">
         UPDATE sar_stand_warning
-        SET POWER ='0'
+            SET POWER ='0'
         WHERE
-        STAND_ID IN (
-        SELECT
-        law_id
-        FROM
-        warning_date
-        WHERE
-        DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
-
-        )
+        STAND_ID IN ( SELECT law_id FROM warning_date WHERE DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d'))
         OR
-        ITEMS_ID IN (
-        SELECT
-        ITEM_ID
-        FROM
-        warning_date
-        WHERE
-        DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
-        )
+        ITEM_ID IN ( SELECT ITEM_ID FROM warning_date WHERE DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d') AND ITEM_ID IS NOT NULL )
     </delete>