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 c371bc49..7178ddf2 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 @@ -126,7 +126,7 @@ public class ScheduledJob { for (String s : item.getSSRQ().split(",")) { - String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}"; + String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}$"; Pattern r = Pattern.compile(pattern); Matcher m = r.matcher(s); 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 1f4b15bd..8cea401f 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 @@ -29,7 +29,7 @@ FROM warning_date WHERE - DATE_FORMAT(SSRQ, '%Y-%m-%d') > DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') ) OR @@ -39,7 +39,7 @@ FROM warning_date WHERE - DATE_FORMAT(SSRQ, '%Y-%m-%d') > DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') ) @@ -79,12 +79,15 @@