fix(safety): 修复追溯单重复生成问题

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

@@ -1123,7 +1123,6 @@
         ) tt on tt."RECORD" = ui."RECORD"
         WHERE si."ORG_BRANCH_CODE" like '50%'
           AND oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
-          AND (oi."STATUS" is null or oi."STATUS" = '1')
           AND tt."NEXT_INSPECT_DATE" is not null
     </select>
     <select id="countBizFinishedNumForDP" resultType="java.lang.Long">

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

@@ -82,16 +82,33 @@ public class SafetyProblemTracingGenServiceImpl{
 
     public void executeInspectionCheck() {
         logger.info("开始检验检测超期检查");
+        Set<String> outOfInspectionEquipIds = safetyProblemTracingService.getBaseMapper().selectList(new LambdaQueryWrapper<SafetyProblemTracing>()
+                        .select(SafetyProblemTracing::getSourceId)
+                .eq(SafetyProblemTracing::getProblemStatusCode, SafetyProblemStatusEnum.UNHANDLED.getCode())
+                .eq(SafetyProblemTracing::getProblemTypeCode, SafetyProblemTypeEnum.JYCQ.getProblemTypeCode()))
+                .stream().map(SafetyProblemTracing::getSourceId).collect(Collectors.toSet());
+
         // 查询当天检验超期的设备
         List<Map<String, Object>> outOfInspectionRecords = commonMapper.queryOutOfInspectionRecord();
+        // 追溯表里未处理的检验超期设备需要排除在外
+        outOfInspectionRecords.removeIf(item -> outOfInspectionEquipIds.contains(String.valueOf(item.get("RECORD"))));
         updateEquipAndSendMessage(outOfInspectionRecords, SafetyProblemTypeEnum.JYCQ);
         logger.info("检验检测超期检查结束");
     }
 
     public void executeMaintenanceCheck() {
         logger.info("开始维保超期检查");
+        Set<String> outOfMaintenanceEquipIds = safetyProblemTracingService.getBaseMapper().selectList(new LambdaQueryWrapper<SafetyProblemTracing>()
+                        .select(SafetyProblemTracing::getSourceId)
+                        .eq(SafetyProblemTracing::getProblemStatusCode, SafetyProblemStatusEnum.UNHANDLED.getCode())
+                        .eq(SafetyProblemTracing::getProblemTypeCode, SafetyProblemTypeEnum.WBCQ.getProblemTypeCode()))
+                .stream().map(SafetyProblemTracing::getSourceId).collect(Collectors.toSet());
+
         // 查询当天维保超期的设备
         List<Map<String, Object>> outOfMaintenanceRecords = commonMapper.queryOutOfMaintenanceRecord();
+
+        // 追溯表里未处理的维保超期设备需要排除在外
+        outOfMaintenanceRecords.removeIf(item -> outOfMaintenanceEquipIds.contains(String.valueOf(item.get("RECORD"))));
         updateEquipAndSendMessage(outOfMaintenanceRecords, SafetyProblemTypeEnum.WBCQ);
         logger.info("维保超期检查结束");
     }