From 557a9f756c4fcaab43dee09d6fa302fdd50f29db Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 10 Jan 2022 12:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AD=98=E5=85=A5=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=9C=A8=E9=A2=84=E8=AD=A6=E6=9C=9F=E9=99=90=E5=86=85,?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A2=84=E8=AD=A6=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E5=B7=B2=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/scheduled/ScheduledJob.java        | 2 +-
 .../mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 9424c392..d5e3f78d 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
@@ -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);
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
index e8abcc3b..df21aa40 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+++ b/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},'%')