From e3a5fa808f1f76174e61962ad75a872a2d338a2a Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Thu, 23 Jun 2022 15:26:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E4=BB=A3=E7=A0=81BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandWarning/SarStandardWarningDao.xml | 23 ++++---------------
 ...0220623_定时任务执行管理表添加预警信息.sql |  2 +-
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml
index 8cea401f..0d3990fc 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml
+++ b/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>
 
 
diff --git a/doc/sql/20220623_定时任务执行管理表添加预警信息.sql b/doc/sql/20220623_定时任务执行管理表添加预警信息.sql
index 48e83a89..42e2e02b 100644
--- a/doc/sql/20220623_定时任务执行管理表添加预警信息.sql
+++ b/doc/sql/20220623_定时任务执行管理表添加预警信息.sql
@@ -1 +1 @@
-INSERT INTO `tb_task`(`id`, `task_name`, `task_desc`, `task_exp`, `task_status`, `task_class`, `update_time`, `create_time`) VALUES ('6', 'task6', '每天定时扫描标准预警数据', '*/5 * * * * ?', 0, 'com.adc.da.scheduled.WarningSchedulingTasks', '2022-06-23 06:19:32', '2022-06-23 06:19:32');
+INSERT INTO `tb_task`(`id`, `task_name`, `task_desc`, `task_exp`, `task_status`, `task_class`, `update_time`, `create_time`) VALUES ('6', 'task6', '每天定时扫描标准预警数据', '0 0 0 * * ?', 0, 'com.adc.da.scheduled.WarningSchedulingTasks', '2022-06-23 06:19:32', '2022-06-23 06:19:32');