解决定时任务跨年查询错误

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

@@ -12,35 +12,35 @@
                 (
                         m.ti_xing_zhou_qi_ = ''
                         AND
-                        date_format(NOW(), '%m-%d') >= date_format(DATE_SUB(m.ren_wu_shi_jian_, INTERVAL '1' DAY), '%m-%d')
+                        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), '%m-%d') >= date_format(NOW(), '%m-%d')
+                        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
-                )
+                        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(), '%m-%d') >= date_format(DATE_SUB(m.ren_wu_shi_jian_, INTERVAL '30' DAY), '%m-%d')
+                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), '%m-%d') >= date_format(NOW(), '%m-%d')
+                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_ !='' or #{jsonObject.userId,jdbcType=VARCHAR} not in (
             select q.qian_dao_ren_
             from t_dsrwqdb q
             where q.parent_id_ = m.id_
-          AND DATE_FORMAT(q.qian_dao_shi_jian
-            , '%Y-%m-%d') = DATE_FORMAT(NOW()
-            , '%Y-%m-%d')
-            )
+              AND DATE_FORMAT(q.qian_dao_shi_jian
+                      , '%Y-%m-%d') = DATE_FORMAT(NOW()
+                      , '%Y-%m-%d')
+        )
             )
-        ORDER BY date_format(ren_wu_shi_jian_, '%m-%d')
+        ORDER BY date_format(ren_wu_shi_jian_, '%Y-%m-%d')
     </select>
 
     <select id="selectAllCronNotifyData" resultType="com.alibaba.fastjson.JSONObject">