fix(核查模块): 李师傅自行修改 核查退回

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

 package com.tykj.dev.device.confirmcheck.controller;
 
+import cn.hutool.core.lang.Func;
 import com.github.wenhao.jpa.Specifications;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -61,6 +62,7 @@ import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_DETAIL;
 import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_STAT;
@@ -265,13 +267,24 @@ public class DeviceCheckController {
     }
 
     @GetMapping("/detail/refresh/active/{id}")
-    public ResponseEntity<String> activeSpecialData(@PathVariable Integer id,@RequestParam String unitName1,@RequestParam(defaultValue = "") String unitName2){
-        log.info("[核查模块] 特殊数据处理,设置specialDetailId = {},specialUnits = {} {} ",id,unitName1,unitName2);
-        specialDetailId = id;
-        specialUnits.add(unitName1);
+    public ResponseEntity<String> activeSpecialData(@PathVariable Integer id,@RequestParam Integer unitId1,@RequestParam(defaultValue = "0") Integer unitId2){
+
+        String unitName1 = "";
+        String unitName2 = "";
+        unitName1 = unitsRepo.findById(unitId1).get().getName();
+        unitName2 = unitsRepo.findById(unitId2).get().getName();
+
+        if (!StringUtils.isEmpty(unitName1)){
+            specialUnits.add(unitName1);
+        }
+
         if (!StringUtils.isEmpty(unitName2)){
             specialUnits.add(unitName2);
         }
+
+        log.info("[核查模块] 特殊数据处理,设置specialDetailId = {},specialUnitsId = {} {} ",id,unitId1,unitId2);
+        specialDetailId = id;
+
         return ResponseEntity.ok("设置特殊数据处理成功");
     }
 
@@ -313,6 +326,8 @@ public class DeviceCheckController {
         }
         detail.updateDevice(devInLib, devNotInLib);
 
+        //更新应查装备数量
+        detail.setCheckingCount(devInLib.size());
         detail = detailRepo.save(detail);
 
         CheckDetailVo cdVo = transUtil.CheckDetailDo2Vo(detail);
@@ -1825,19 +1840,21 @@ public class DeviceCheckController {
         boolean hasParent = parentTaskId != 0;
 
         //尝试寻找老的市办结任务，如果有的话就删除加END
-        //5.需要将上一次市的确认任务给清理掉
+        //5.需要将上一次市的确认任务给清理掉 统计确认任务关联的是statId 找到billId -> exam Task ->
         // 父级的父级，就是省的任务，然后子child里名字包含 统计数据确认任务 的任务给 END 吧
-        Task verifyTask = taskRepo.findAllByParentTaskId(parentTaskId)
+        Map<Integer, List<Task>> doneTaskList = taskRepo.findAllByParentTaskId(parentTaskId)
                 .stream()
                 .filter(task -> task.getTitle().contains("统计数据确认任务"))
-                .sorted(Comparator.comparing(Task::getId))
-                .findFirst()
-                .orElse(null);
+                .collect(groupingBy(Task::getBillId));
+
+        List<Task> existsDone = doneTaskList.get(statId);
 
-        if (Objects.nonNull(verifyTask)) {
-            log.info("[核查模块] 发现了id = {}市的统计确认任务,将其完结并剔除整个树节点", verifyTask.getId());
-            verifyTask.setParentTaskId(0);
-            taskService.moveToEnd(verifyTask.parse2Bto());
+        if (Objects.nonNull(existsDone)){
+            for (Task d : existsDone) {
+                log.info("[核查模块] 发现了id = {}市的重复的统计确认任务,将其完结并剔除整个树节点", d.getId());
+                d.setParentTaskId(0);
+                taskService.moveToEnd(d.parse2Bto());
+            }
         }
 
         if (hasParent) {