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);