[核查模块] 逾期，丢失，销毁，任务数量统计bug fix

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -157,17 +157,27 @@ public class DeviceCheckController {
         String checkUnit = detail.getCheckUnit();
         //查出所有装备 分为4类 A 所在是本单位 B 所属是本单位 其中
         List<DeviceLibrary> allDevices = deviceRepo.findAll();
-        //在库 = A and B & not B
+        //在库 = A and B & not B 去除掉ls = 10 的装备 把ls = 11 的装备加入到非在库
         Map<Boolean, List<DeviceLibrary>> locationMap = allDevices.stream()
                 .collect(partitioningBy(d -> d.getLocationUnit().equals(checkUnit)));
 
         List<DeviceLibrary> devInLib = locationMap.get(true);
 
+        // filter ls == 11 join to 非在库
+        List<DeviceLibrary> ls11Lib = devInLib.stream().filter(d -> d.getLifeStatus() == 11).collect(toList());
+
+        // filter ls == 10
+        devInLib = devInLib.stream()
+                .filter(d -> d.getLifeStatus() != 10 && d.getLifeStatus() != 11)
+                .collect(toList());
+
         // 非在库 = not A and in B
         List<DeviceLibrary> devNotInLib = locationMap.get(false)
                 .stream().filter(d -> d.getOwnUnit().equals(checkUnit))
                 .collect(toList());
 
+        devNotInLib.addAll(ls11Lib);
+
         // 更新detail
         detail.updateDevice(devInLib, devNotInLib);
 
@@ -206,8 +216,14 @@ public class DeviceCheckController {
                 long startTime = System.currentTimeMillis();
                 long finalTime = System.currentTimeMillis();
                 for (Task child : childTask) {
+                    // 将子节点任务中的 统计数据确认任务 给过滤掉
+                    if (child.getTitle().contains("统计数据确认任务")) {
+                        continue;
+                    }
+
                     Integer childBusType = child.getBusinessType();
                     Integer childBusId = child.getBillId();
+
                     // 处理子节点，子节点有两种类型 - 检查类统计与自查类数据
                     if (childBusType.equals(CONFIRM_CHECK_STAT.id)) {
                         startTime = System.currentTimeMillis();
@@ -387,26 +403,33 @@ public class DeviceCheckController {
         }
 
         //核查结果
-        if (endTime.isBefore(LocalDateTime.now())) {
-            if (revAreaStat.getComProgress() ==1){
-                lcd.setCheckResult("逾期进行中");
-            }else if (task.getBillStatus() != 9999 || revAreaStat.getComProgress() != 2) {
-                lcd.setCheckResult("逾期");
-            } else {
+//        if (endTime.isBefore(LocalDateTime.now())) {
+//            if (revAreaStat.getComProgress() ==1){
+//                lcd.setCheckResult("逾期进行中");
+//            }else if (task.getBillStatus() != 9999 || revAreaStat.getComProgress() != 2) {
+//                lcd.setCheckResult("逾期");
+//            } else {
+//                lcd.setCheckResult("逾期完成");
+//            }
+//        } else {
+        if (task.getBillStatus() == 9999) {
+            if (endTime.isBefore(LocalDateTime.now())) {
                 lcd.setCheckResult("逾期完成");
-            }
-        } else {
-            if (task.getBillStatus() == 9999) {
+            } else {
                 lcd.setCheckResult("完成");
-            } else if (revAreaStat.getComProgress() == 0) {
-                lcd.setCheckResult("未开始");
-            } else if (revAreaStat.getComProgress() == 1) {
-                lcd.setCheckResult("进行中");
-            } else if (revAreaStat.getComProgress() == 2 && task.getBillStatus() % 10 == 0) {
-                lcd.setCheckResult("进行中");
-            } else if (revAreaStat.getComProgress() == 2 && task.getBillStatus() % 10 == 1) {
-                lcd.setCheckResult("进行中");
-            } else if (revAreaStat.getComProgress() == 2) {
+            }
+        } else if (revAreaStat.getComProgress() == 0) {
+            lcd.setCheckResult("未开始");
+        } else if (revAreaStat.getComProgress() == 1) {
+            lcd.setCheckResult("进行中");
+        } else if (revAreaStat.getComProgress() == 2 && task.getBillStatus() % 10 == 0) {
+            lcd.setCheckResult("进行中");
+        } else if (revAreaStat.getComProgress() == 2 && task.getBillStatus() % 10 == 1) {
+            lcd.setCheckResult("进行中");
+        } else if (revAreaStat.getComProgress() == 2) {
+            if (endTime.isBefore(LocalDateTime.now())) {
+                lcd.setCheckResult("逾期完成");
+            } else {
                 lcd.setCheckResult("完成");
             }
         }
@@ -438,26 +461,24 @@ public class DeviceCheckController {
         }
 
         //核查结果
-        if (endTime.isBefore(LocalDateTime.now())) {
-            if (revAreaStat.getComProgress() ==1){
-                led.setCheckResult("逾期进行中");
-            }else if (task.getBillStatus() != 9999 || revAreaStat.getComProgress() != 2) {
-                led.setCheckResult("逾期");
-            } else {
+        if (task.getBillStatus() == 9999) {
+            if (endTime.isBefore(LocalDateTime.now())) {
                 led.setCheckResult("逾期完成");
-            }
-        } else {
-            if (task.getBillStatus() == 9999) {
+            } else {
                 led.setCheckResult("完成");
-            } else if (revAreaStat.getComProgress() == 0) {
-                led.setCheckResult("未开始");
-            } else if (revAreaStat.getComProgress() == 1) {
-                led.setCheckResult("进行中");
-            } else if (revAreaStat.getComProgress() == 2 && task.getBillStatus() % 10 == 0) {
-                led.setCheckResult("进行中");
-            } else if (revAreaStat.getComProgress() == 2 && task.getBillStatus() % 10 == 1) {
-                led.setCheckResult("进行中");
-            } else if (revAreaStat.getComProgress() == 2) {
+            }
+        } else if (revAreaStat.getComProgress() == 0) {
+            led.setCheckResult("未开始");
+        } else if (revAreaStat.getComProgress() == 1) {
+            led.setCheckResult("进行中");
+        } else if (revAreaStat.getComProgress() == 2 && task.getBillStatus() % 10 == 0) {
+            led.setCheckResult("进行中");
+        } else if (revAreaStat.getComProgress() == 2 && task.getBillStatus() % 10 == 1) {
+            led.setCheckResult("进行中");
+        } else if (revAreaStat.getComProgress() == 2) {
+            if (endTime.isBefore(LocalDateTime.now())) {
+                led.setCheckResult("逾期完成");
+            } else {
                 led.setCheckResult("完成");
             }
         }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -129,6 +129,7 @@ public class ObjTransUtil {
 
         // 构建完成情况参数 未完成数量/总数
         // 获得当前节点的子节点总数 = 总数 其中状态为9999的为已完成
+        //
         TaskBto fatherTask = taskService.get(stat.getId(), BusinessEnum.CONFIRM_CHECK_STAT.id);
         Integer fatherTaskId = fatherTask.getId();
 
@@ -137,7 +138,7 @@ public class ObjTransUtil {
         boolean flag = false;
         boolean confirmTaskisDone = false;
         for (Task task : childTask) {
-            if (task.getTitle().contains("统计确认待办任务")) {
+            if (task.getTitle().contains("统计数据确认任务")) {
                 if (task.getBillStatus() != 9999) {
                     flag = true;
                 } else {
@@ -148,7 +149,9 @@ public class ObjTransUtil {
 
         // 3/3 -> 统计待确认 -> 省统计任务待完结
 
-        childTask = childTask.stream().filter(task -> !task.getTitle().contains("统计确认待办任务"))
+        childTask = childTask.stream()
+                .filter(task -> !task.getTitle().contains("统计数据待办任务"))
+                .filter(task -> !task.getTitle().contains("统计数据确认任务"))
                 .collect(toList());
 
         long total = childTask.size();