预警存入日期表的数据应该在预警期限内,查询预警数据时已逻辑删除的数据不显示

adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java

@@ -130,7 +130,7 @@ public class ScheduledJob {
 
             for (String s : item.getSSRQ().split(",")) {
 
-                String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}$";
+                String pattern = term.getTermStr();
 
                 Pattern r = Pattern.compile(pattern);
                 Matcher m = r.matcher(s);

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml

@@ -205,6 +205,7 @@
         <where>
             POWER = '1'
             AND (MARK = 'stand')
+            AND sarInfo.VALID_FLAG='0'
             <include refid="stand_where"/>
             <if test="waringEO.applyType != null and waringEO.applyType != ''">AND attr.CLLX LIKE CONCAT('%',
                 #{waringEO.applyType},'%')
@@ -249,6 +250,7 @@
         <where>
             POWER = '1'
             AND (MARK = 'item')
+            AND sarInfo.VALID_FLAG='0'
             <include refid="stand_where"/>
             <if test="waringEO.applyType != null and waringEO.applyType != ''">
               AND  items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%')