fix(jg):修复维保备案和检验检测超期数据修正问题

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -2721,7 +2721,7 @@
         FROM
         tzs_user_permission tup
         LEFT JOIN tzs_user_info tui ON tup.user_seq = tui.sequence_nbr
-        LEFT JOIN tz_base_enterprise_info ei ON ei.use_unit_code = tui.unit_code
+        LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = tui.unit_code
         WHERE
         tup.expiry_date <![CDATA[<]]>  CURRENT_DATE AND tup.permission_post IN ('permissionData66151', 'permissionData66152', 'permissionData6552');
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingGenServiceImpl.java

@@ -77,6 +77,21 @@ public class SafetyProblemTracingGenServiceImpl{
         executePersonnalCertificationCheck();
     }
 
+    @Scheduled(cron = "0 0 5 ? * SAT")
+    @SchedulerLock(name = "correctOverdueProblem", lockAtMostFor = "PT5H", lockAtLeastFor = "PT60M")
+    public void correctOverdueProblem() {
+        try {
+            logger.info("开始执行 overdue problem 修复任务");
+            long startTime = System.currentTimeMillis();
+            repairMaintenanceAndInspectionOverdueProblem();
+            long endTime = System.currentTimeMillis();
+            logger.info("overdue problem 修复任务执行完成，耗时: {} ms", (endTime - startTime));
+        } catch (Exception e) {
+            logger.error("执行 overdue problem 修复任务时发生异常", e);
+        }
+    }
+
+
     public void executePersonnalCertificationCheck() {
         logger.info("开始人员资质超期检查");
         List<Map<String, Object>> certificationRecords = commonMapper.queryOutOfCertificationRecord();
@@ -236,7 +251,7 @@ public class SafetyProblemTracingGenServiceImpl{
     }
 
     public void repairMaintenanceAndInspectionOverdueProblem() {
-        logger.info("开始设备维保备案和建议检查超期数据修正");
+        logger.info("开始设备维保备案和检验检测超期数据修正");
         Set<String> realOutOfMaintenanceRecord = commonMapper.queryOutOfMaintenanceRecord().stream().map(m -> m.get("RECORD").toString()).collect(Collectors.toSet());
         Set<String> realOutOfInspectRecord = commonMapper.queryOutOfInspectionRecord().stream().map(m -> m.get("RECORD").toString()).collect(Collectors.toSet());
         // 需要修正业务表+es的数据