From b0cd4806c47e8845a1428a52bcc9c0b422e794ad Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 30 Dec 2021 21:55:15 +0800
Subject: [PATCH 1/2] commit

---
 .../service/impl/SarStandardsInfoServiceImpl.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 5a211419..16353926 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -714,9 +714,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    public void  attrInfoShowExport(List<SarStandardsInfo> sarlist,Map<String,String> dicMap) throws Exception {
-
+    public void  attrInfoShowExport(List<SarStandardsInfo> sarlist) throws Exception {
 
+        //查询字典表,形成Hash映射提升速度
+        List<DicTypeEO> dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name");
+        Map<String, String> dicMap = dicInfo.stream()
+                .filter(item-> !item.getDicTypeCode().isEmpty())
+                .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2));
 
 
         for (SarStandardsInfo row : sarlist) {
@@ -1705,12 +1709,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         List<SarStandardsInfo> getList = dao.getSarStandardsExportInfo(page);
 
-        //查询字典表,形成Hash映射提升速度
-        List<DicTypeEO> dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name");
-        Map<String, String> dicMap = dicInfo.stream()
-                .filter(item-> !item.getDicTypeCode().isEmpty())
-                .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2));
-        attrInfoShowExport(getList,dicMap);
+        attrInfoShowExport(getList);
         return getList;
     }
 

From 692bffa7d0c773caf1e1348d4f4eabb3090bd6d3 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 31 Dec 2021 09:47:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/scheduled/ScheduledJob.java     |  2 +-
 .../sarStandWarning/SarStandardWarningDao.xml       | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 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 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') &gt; DATE_FORMAT(now(), '%Y-%m-%d')
+        DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
 
         )
         OR
@@ -39,7 +39,7 @@
         FROM
         warning_date
         WHERE
-        DATE_FORMAT(SSRQ, '%Y-%m-%d') &gt; DATE_FORMAT(now(), '%Y-%m-%d')
+        DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
         )
     </delete>
 
@@ -79,12 +79,15 @@
 
     <select id="getWarningDate" resultType="com.adc.da.slrs.sarStandWarning.entity.WarningDate">
 
+select A.* from
 
-
+(
         select attr.STAND_ID as lawId,'-1' as itemId,'SSRQ' as timeName,
         SSRQ as SSRQ
         from sar_stand_attr_info attr
         WHERE
+
+
         SSRQ REGEXP #{termStr}
 
         UNION ALL
@@ -119,6 +122,10 @@
         from sar_stand_items item
            WHERE
             XCXSSRQ REGEXP #{termStr}
+            ) AS A
+            left join sar_standards_info as sarInfo
+            on sarInfo.id=A.lawId
+            where sarInfo.valid_flag = '0'
 
 
     </select>