From 346f35f5481eae3516c86bb23d9c0b054c565182 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 9 Sep 2021 19:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E5=86=8D=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E6=97=A5=E6=9C=9F=E5=88=B0=E8=BE=BE=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E6=9C=9F=E9=99=90=E6=97=B6,=E6=96=B0=E8=BD=A6=E5=9E=8B?=
 =?UTF-8?q?=E5=92=8C=E5=9C=A8=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=B8=8D=E5=9C=A8=E9=A2=84=E8=AD=A6=E6=9C=9F=E9=99=90?=
 =?UTF-8?q?,=E5=8F=96=E6=B6=88=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/scheduled/ScheduledJob.java    | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
index 79a0bb79..b24c2056 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
@@ -57,8 +57,8 @@ public class ScheduledJob {
 
 
 
-    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
-//    @Scheduled(cron="*/5 * * * * ?")
+//    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
+    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void WarningSchedulingTasks() {
 
@@ -129,10 +129,15 @@ public class ScheduledJob {
                     .setMark("3")
                     .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear());
 
-            //实施日期达到预警时间,但新车型实施日期不在时间内
-            if (term.isTerm(warningEO.getXCXSSRQ())){
-                warningEO.setPutTime(warningEO.getXCXSSRQ());
-            }
+
+            //实施日期达到预警时间,但在产车实施日期不在时间内
+            /**
+             * 2021/9/9取消限制
+             */
+//            if (term.isTerm(warningEO.getXCXSSRQ())){
+//                warningEO.setPutTime(warningEO.getXCXSSRQ());
+//            }
+            warningEO.setPutTime(warningEO.getXCXSSRQ());
 
         }
         warningList.addAll(standInfoXCXSSRQ);
@@ -150,9 +155,13 @@ public class ScheduledJob {
                     .setMark("4")
                     .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear());
             //实施日期达到预警时间,但在产车实施日期不在时间内
-            if (term.isTerm(warningEO.getZCCSSRQ())){
-                warningEO.setPutTime(warningEO.getZCCSSRQ());
-            }
+            /**
+             * 2021/9/9取消限制
+             */
+//            if (term.isTerm(warningEO.getZCCSSRQ())){
+//                warningEO.setPutTime(warningEO.getZCCSSRQ());
+//            }
+            warningEO.setPutTime(warningEO.getZCCSSRQ());
         }
         warningList.addAll(standInfoZCCSSRQ);