[task-2032]应急预案演练计划后跑定时任务未推送实施记录、项目字段缺少等

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/CronNotifyDao.xml

@@ -4,34 +4,16 @@
 <mapper namespace="com.lc.ibps.sysdata.dao.CronNotifyDao">
 
     <select id="getCronNotifyData" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT m.*
-        FROM t_dsrw m
-        WHERE  (m.ren_wu_zhuang_tai != '已完成' and m.ren_wu_zhuang_tai != '不提醒')
-          AND (
-                (
-                        m.ti_xing_zhou_qi_ = ''
-                        AND
-                        date_format(NOW(), '%Y-%m-%d') >= date_format(DATE_SUB(m.ren_wu_shi_jian_, INTERVAL '1' DAY), '%Y-%m-%d')
-                        AND
-                        date_format(DATE_SUB(m.ren_wu_shi_jian_, INTERVAL '-30' DAY), '%Y-%m-%d') >= date_format(NOW(), '%Y-%m-%d')
-                    )
-                OR
-                (
-                        m.ti_xing_zhou_qi_ != ''
-                        AND
-                        TIMESTAMPDIFF(DAY, date_format(NOW(),  CONCAT(CONVERT(DATE_FORMAT(NOW(),'%Y'),CHAR),'-%m-%d')),
-                                      date_format(m.ren_wu_shi_jian_, CONCAT(CONVERT(DATE_FORMAT(NOW(),'%Y'),CHAR),'-%m-%d')))
-                            mod m.ti_xing_zhou_qi_ = 0
-                    )
-            )
-          AND date_format(NOW(),'%Y-%m')=date_format(m.ren_wu_shi_jian_,'%Y-%m')
-          AND
-                date_format(NOW(), '%Y-%m-%d') >= date_format(DATE_SUB(m.ren_wu_shi_jian_, INTERVAL '30' DAY), '%Y-%m-%d')
-          AND
-                date_format(DATE_SUB(m.ren_wu_shi_jian_, INTERVAL '-30' DAY), '%Y-%m-%d') >= date_format(NOW(), '%Y-%m-%d')
-
-          AND  m.ti_xing_zhou_qi_ !=''
-        ORDER BY date_format(ren_wu_shi_jian_, '%Y-%m-%d')
+        SELECT
+        m.*
+        FROM
+        t_dsrw m
+        WHERE
+        m.ren_wu_zhuang_tai NOT IN ( '已完成', '不提醒' )
+        AND m.ren_wu_shi_jian_ >= CURDATE()
+        AND m.ren_wu_shi_jian_ <![CDATA[ <= ]]> CURDATE() + INTERVAL 30 DAY
+        ORDER BY
+        m.ren_wu_shi_jian_
     </select>
 
     <select id="selectAllCronNotifyData" resultType="com.alibaba.fastjson.JSONObject">