Merge branch 'develop_master' into 'FOTON'

Develop master

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

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

@@ -115,7 +115,6 @@ public class ScheduledJob {
 
         logger.info("开始执行预警!!!");
         logger.info("========================================================================================================");
-
         logger.info("========================================================================================================");
         //删除不在预警范围的标准
         int remove = sarStandardWarningDao.autoCancelWarning();
@@ -186,6 +185,14 @@ public class ScheduledJob {
 //    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void TextStatusSchedulingTasks() {
+        Logger logger = LoggerFactory.getLogger(ScheduledJob.class);
+
+
+        logger.info("=========================================================================================================");
+        logger.info("=========================================================================================================");
+        logger.info("开始更新文本状态!!!");
+        logger.info("=========================================================================================================");
+        logger.info("=========================================================================================================");
         QueryWrapper<SarStandardsInfo> wrapper = new QueryWrapper<>();
 
         TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now());
@@ -294,7 +301,8 @@ public class ScheduledJob {
                 System.out.println("代替标准状态更新:id为"+key+"文本状态更新失败");
             }
         }
-
+        logger.info("==================================更新文本状态结束======================================");
+        logger.info("==================================更新文本状态结束======================================");
 
     }
 }

adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java

@@ -37,8 +37,8 @@ public class TermDTO {
     public TermDTO() {
         //系统当前日期
         LocalDate starDate = LocalDate.now();
-        //系统当前日期3个月后
+        //系统当前日期36个月后
-        LocalDate endDate = LocalDate.now().plusMonths(12);
+        LocalDate endDate = LocalDate.now().plusMonths(36);
 
         convertToStr(starDate,endDate);
     }

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

@@ -191,7 +191,7 @@
         APPLY_TYPE ,
         attr
         .ZRGCS AS DUTY_ENGINEER ,
-        NULL AS ITEMS_ID ,
+        ITEMS_ID ,
         NULL AS ITEMS_NUM , NULL AS ITEMS_NAME ,
         NULL AS POLICY_ID ,
         NULL AS POLICY_NAME ,
@@ -273,10 +273,11 @@
         WARNING_RESULT
         LEFT JOIN
         (
-        SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date
+        SELECT item_id,law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date
-        GROUP BY warning_date.law_id
+        GROUP BY warning_date.law_id,item_id
         ) warning_date
         ON warning_date.law_id = WARNING_RESULT.STAND_ID
+        AND warning_date.item_id = WARNING_RESULT.ITEMS_ID
         ORDER BY warning_date.SSRQ_MIN
 
     </select>