fix(amos-boot-module-jg): 修复安全问题追溯生成逻辑- 修复维保和检验超期设备状态更新逻辑

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

@@ -145,14 +145,14 @@ public class SafetyProblemTracingGenServiceImpl{
             correctData.addAll(inspectionSet);
         } else if (!maintenanceSet.isEmpty()) {
             // 再次查询维保备案这些数据有没有检验超期的问题
+            maintenanceSet.removeAll(realOutOfInspectRecord);
             // 没有则可以愉快地更新设备状态为正常
-            maintenanceSet.retainAll(realOutOfInspectRecord);
+            correctData.addAll(maintenanceSet);
             // 再次查询检验这些数据有没有维保超期问题
-            // 没有则可以愉快地更新设备状态为正常
             inspectionSet.retainAll(realOutOfMaintenanceRecord);
-
-            correctData.addAll(maintenanceSet);
+            // 没有则可以愉快地更新设备状态为正常
             correctData.addAll(inspectionSet);
+
         }
         idxBizJgOtherInfoService.lambdaUpdate().set(IdxBizJgOtherInfo::getStatus, null)
                 .in(IdxBizJgOtherInfo::getRecord, correctData).update();
@@ -182,6 +182,9 @@ public class SafetyProblemTracingGenServiceImpl{
         List<String> outOfMaintenanceEquipIds = problemList.stream().map(SafetyProblemTracing::getSourceId).collect(Collectors.toList());
         // 未超期但错误生成的维保超期设备
         outOfMaintenanceEquipIds.removeIf(realOutOfMaintenanceRecord::contains);
+        if (ValidationUtil.isEmpty(outOfMaintenanceEquipIds)) {
+            return Lists.newArrayList();
+        }
         safetyProblemTracingService.lambdaUpdate()
                 .set(SafetyProblemTracing::getProblemStatusCode, SafetyProblemStatusEnum.HANDLED.getCode())
                 .set(SafetyProblemTracing::getProblemStatus, SafetyProblemStatusEnum.HANDLED.getName())
@@ -210,6 +213,9 @@ public class SafetyProblemTracingGenServiceImpl{
         List<String> outOfInspectionEquipIds = problemList.stream().map(SafetyProblemTracing::getSourceId).collect(Collectors.toList());
         // 未超期但错误生成的检验超期设备
         outOfInspectionEquipIds.removeIf(realOutOfInspectRecord::contains);
+        if (ValidationUtil.isEmpty(outOfInspectionEquipIds)) {
+            return Lists.newArrayList();
+        }
         safetyProblemTracingService.lambdaUpdate()
                 .set(SafetyProblemTracing::getProblemStatusCode, SafetyProblemStatusEnum.HANDLED.getCode())
                 .set(SafetyProblemTracing::getProblemStatus, SafetyProblemStatusEnum.HANDLED.getName())