Merge branch 'develop_master' into 'FOTON'

Develop master

See merge request LiuChao/foton-slrs-system-rest!347

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

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映射提升速度
+        attrInfoShowExport(getList);
-        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);
         return getList;
     }
 

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')
         )
     </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>