[核查模块] 增加了统计任务正确变为待办的feature

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

@@ -73,9 +73,9 @@ import static java.util.stream.Collectors.*;
 @Api(tags = "核查模块", description = "核查模块", position = 1)
 public class DeviceCheckController {
 
-    Map<Integer,String> desMap=new HashMap<>();
+    Map<Integer, String> desMap = new HashMap<>();
 
-    Map<Integer,String> desBillMap=new HashMap<>();
+    Map<Integer, String> desBillMap = new HashMap<>();
 
     @Autowired
     private DeviceCheckStatDao statRepo;
@@ -119,7 +119,7 @@ public class DeviceCheckController {
     @ApiOperation(value = "查询默认的可以被核查单位的清单(省本直,省直属,市局)")
     public ResponseEntity findDefaultUnits() {
 
-        return ResponseEntity.ok(new ResultObj<>(unitsRepo.findAllByTypeNotInAndLevelIn(Lists.newArrayList(3),Lists.newArrayList(0,1,2))));
+        return ResponseEntity.ok(new ResultObj<>(unitsRepo.findAllByTypeNotInAndLevelIn(Lists.newArrayList(3), Lists.newArrayList(0, 1, 2))));
     }
 
     @ApiOperation(value = "根据id查询核查统计数据", notes = "可以通过这个接口查询核查统计数据")
@@ -209,7 +209,7 @@ public class DeviceCheckController {
 
                         LinkCheckDetail lcd = rev2lcd(child, endTime, cas.reverse());
                         lcd.setCheckUnit(unitName);
-                        if (child.getTitle().contains("统计确认待办任务")){
+                        if (child.getTitle().contains("统计确认待办任务")) {
                             lcd.setCheckSituation("统计确认待办任务");
                         }
 
@@ -349,9 +349,9 @@ public class DeviceCheckController {
         } else if (revAreaStat.getComSituation() == 1) {
             lcd.setCheckSituation("有误");
         } else if (revAreaStat.getComSituation() == 0) {
-            if (revAreaStat.getComProgress() == 0){
+            if (revAreaStat.getComProgress() == 0) {
                 lcd.setCheckSituation("无");
-            }else {
+            } else {
                 lcd.setCheckSituation("无误");
             }
         } else {
@@ -390,9 +390,9 @@ public class DeviceCheckController {
         } else if (revAreaStat.getComSituation() == 1) {
             led.setCheckSituation("有误");
         } else if (revAreaStat.getComSituation() == 0) {
-            if (revAreaStat.getComProgress() == 0){
+            if (revAreaStat.getComProgress() == 0) {
                 led.setCheckSituation("无");
-            }else {
+            } else {
                 led.setCheckSituation("无误");
             }
         } else {
@@ -473,7 +473,7 @@ public class DeviceCheckController {
         DeviceCheckStat deviceCheckStat = statRepo.getOne(statId);
         String title = deviceCheckStat.getTitle();
         String remark = deviceCheckStat.getRemark();
-        return ResponseEntity.ok(new CheckTitleAndTimeVo(title, deviceCheckStat.getEndTime(),remark));
+        return ResponseEntity.ok(new CheckTitleAndTimeVo(title, deviceCheckStat.getEndTime(), remark));
     }
 
     @ApiOperation(value = "发起自动核查", notes = "发起自动核查")
@@ -485,7 +485,7 @@ public class DeviceCheckController {
 
     @ApiOperation(value = "根据地区ID获取下级的单位", notes = "根据地区ID获取下级的单位")
     @GetMapping("/under/{areaId}")
-    public ResponseEntity getUnitsUnderAreaId(@PathVariable Integer areaId){
+    public ResponseEntity getUnitsUnderAreaId(@PathVariable Integer areaId) {
         //1.获取child AreaId List
         List<Integer> areaIds = areaRepo.findAllByFatherId(areaId).stream()
                 .map(Area::getId)
@@ -500,7 +500,7 @@ public class DeviceCheckController {
 
     @ApiOperation(value = "检查地区是否发起核查", notes = "检查地区是否发起核查")
     @PostMapping("/checkPossible")
-    public ResponseEntity checkPossible(@RequestBody UnitIds uuid){
+    public ResponseEntity checkPossible(@RequestBody UnitIds uuid) {
         List<String> unitNames = uuid.getIds().stream()
                 .map(id -> auService.findOne(AuExample.UnitId, id))
                 .map(AreaUnit::getUnitName)
@@ -511,7 +511,7 @@ public class DeviceCheckController {
 
         for (String unitName : unitNames) {
             List<DeviceLibrary> devices = deviceRepo.findAllByOwnUnit(unitName);
-            if (devices.size() == 0){
+            if (devices.size() == 0) {
                 findEmpty = true;
                 alertString += unitName + " ";
             }
@@ -554,7 +554,7 @@ public class DeviceCheckController {
         provStatTask.setCustomInfo("check");
         provStatTask = taskService.start(provStatTask);
 
-        desMap.put(provStatTask.getId(),ccVO.getRemark());
+        desMap.put(provStatTask.getId(), ccVO.getRemark());
         //构建市的检查任务(level=2)
         List<Units> examCheckUnits = checkedUnits.stream()
                 .filter(units -> Arrays.asList(2).contains(units.getLevel()))
@@ -735,7 +735,7 @@ public class DeviceCheckController {
             Units unit = unitsRepo.findById(ed.getUnitId()).get();
             String names = ed.getUserNames().stream().collect(joining(","));
             // 3-1  构建被查单位的 自查账单
-            DeviceCheckDetail unitDetailDoc = DeviceCheckDetail.EmptyWithChecker(names + "|" + ed.getRemark(), ceVo.getTitle()+"%^&"+ed.getRemark(), 0, 0, 0, 0, unit.getName(), devInLib.getOrDefault(unit.getName(), new ArrayList<>()), devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
+            DeviceCheckDetail unitDetailDoc = DeviceCheckDetail.EmptyWithChecker(names + "|" + ed.getRemark(), ceVo.getTitle() + "%^&" + ed.getRemark(), 0, 0, 0, 0, unit.getName(), devInLib.getOrDefault(unit.getName(), new ArrayList<>()), devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
             DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
             detailIds.add(detail.getId());
             // 将id放入统计中去 model ->  areaName -> detailId
@@ -752,9 +752,9 @@ public class DeviceCheckController {
             // 3-2  构建被查单位的 自查任务 (根据被查单位的级别来区分是县级状态是市级状态)
             TaskBto checkedTask = new TaskBto(CHECK_EXAM_DETAIL_0.id, "自核查任务", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, detail.getId(), unit.getUnitId(), 0);
             checkedTask.setCustomInfo("manual");
-            checkedTask=taskService.start(checkedTask);
-            desBillMap.put(detail.getId(),ed.getRemark());
-            desMap.put(checkedTask.getId(),ed.getRemark());
+            checkedTask = taskService.start(checkedTask);
+            desBillMap.put(detail.getId(), ed.getRemark());
+            desMap.put(checkedTask.getId(), ed.getRemark());
         }
 
         // 4. 重新设置并保存统计账单
@@ -772,17 +772,17 @@ public class DeviceCheckController {
      */
     @ApiOperation(value = "根据taskId查询Remark", notes = "根据taskId查询Remark")
     @GetMapping("/selectRemark/{taskId}")
-    public ResponseEntity selectRemark(@PathVariable Integer taskId){
-        TaskBto taskBto=selectProvTask(taskId);
-        Optional<DeviceCheckStat> optional= statRepo.findById(taskBto.getBillId());
-        if (optional.isPresent()){
-            DeviceCheckStat deviceCheckStat=optional.get();
-            if (deviceCheckStat.getCheckType().getId()==0){
+    public ResponseEntity selectRemark(@PathVariable Integer taskId) {
+        TaskBto taskBto = selectProvTask(taskId);
+        Optional<DeviceCheckStat> optional = statRepo.findById(taskBto.getBillId());
+        if (optional.isPresent()) {
+            DeviceCheckStat deviceCheckStat = optional.get();
+            if (deviceCheckStat.getCheckType().getId() == 0) {
                 return ResponseEntity.ok(desMap.get(taskBto.getId()));
-            }else {
+            } else {
                 return ResponseEntity.ok(desMap.get(taskId));
             }
-        }else {
+        } else {
             throw new ApiException(ResponseEntity.status(500).body("没有找到id"));
         }
 
@@ -794,22 +794,21 @@ public class DeviceCheckController {
      */
     @ApiOperation(value = "根据BillId查询Remark", notes = "根据taskId查询Remark")
     @GetMapping("/selectRemarkBill/{billId}")
-    public ResponseEntity selectRemarkBill(@PathVariable Integer billId){
+    public ResponseEntity selectRemarkBill(@PathVariable Integer billId) {
 
-     return ResponseEntity.ok(desBillMap.get(billId));
+        return ResponseEntity.ok(desBillMap.get(billId));
     }
 
 
-    private TaskBto selectProvTask(Integer taskId){
-      TaskBto taskBto=  taskService.get(taskId);
-      if (taskBto.getParentTaskId()==0){
-          return taskBto;
-      }
-       return selectProvTask(taskBto.getParentTaskId());
+    private TaskBto selectProvTask(Integer taskId) {
+        TaskBto taskBto = taskService.get(taskId);
+        if (taskBto.getParentTaskId() == 0) {
+            return taskBto;
+        }
+        return selectProvTask(taskBto.getParentTaskId());
     }
 
 
-
     /**
      * 对于专员A来说的逻辑
      * 1. 修改detailString
@@ -829,7 +828,7 @@ public class DeviceCheckController {
         String detailString = transUtil.devLib2String(devLibVo.getDevInLibrary(), devLibVo.getDevNotInLibrary());
         User currentUser = Objects.requireNonNull(authenticationUtils.getAuthentication()).getCurrentUserInfo();
         long count = devLibVo.getDevInLibrary().stream()
-                .filter(deviceInLibVo -> deviceInLibVo.getProofResult() % 10 !=9)
+                .filter(deviceInLibVo -> deviceInLibVo.getProofResult() % 10 != 9)
                 .count();
         detailRepo.updateCheckDetail(id, detailString, checkResult, currentUser.getUserId(), assignUserId, (int) count);
         //2. 推进TASK 状态
@@ -905,10 +904,10 @@ public class DeviceCheckController {
                                                 @RequestParam(required = false, defaultValue = "0") int isUpdate,
                                                 @RequestParam String checkResult,
                                                 @RequestBody DetailVo detailVo
-) {
+    ) {
 
-         List<FileRet> checkFiles = detailVo.getCheckFiles();
-         DevLibVo devLibVo  = detailVo.getDevLibVo();
+        List<FileRet> checkFiles = detailVo.getCheckFiles();
+        DevLibVo devLibVo = detailVo.getDevLibVo();
         log.info("[核查模块] 专管员B正在进行核查操作，核查账单id为 {} ,且审核状态为 : {}", id, checkStatus == 1 ? "通过" : "不通过");
         if (checkStatus == 0) {
             return ResponseEntity.status(400).body(new ResultObj<>("checkStatus不应该为0!"));
@@ -932,10 +931,10 @@ public class DeviceCheckController {
                 String detailString = transUtil.devLib2String(devLibVo.getDevInLibrary(), devLibVo.getDevNotInLibrary());
                 User currentUser = Objects.requireNonNull(authenticationUtils.getAuthentication()).getCurrentUserInfo();
                 long count = devLibVo.getDevInLibrary().stream()
-                        .filter(deviceInLibVo -> deviceInLibVo.getProofResult() %10 !=9)
+                        .filter(deviceInLibVo -> deviceInLibVo.getProofResult() % 10 != 9)
                         .count();
-                log.info("[核查模块] 检测到专管员B人工核查修改了核查结果，实查装备数量为 : {}",count);
-                detailRepo.updateCheckDetail4Check(id, detailString, checkResult,  (int) count);
+                log.info("[核查模块] 检测到专管员B人工核查修改了核查结果，实查装备数量为 : {}", count);
+                detailRepo.updateCheckDetail4Check(id, detailString, checkResult, (int) count);
             }
 
 
@@ -958,8 +957,8 @@ public class DeviceCheckController {
             } else {
                 // 如果是2流程的，则直接结束该任务
                 log.info("[核查模块] 该详情任务是一个2流程任务，结束任务并统计数据...");
-                summaryDetail(currentTask, currentDetail);
                 taskService.moveToEnd(currentTask);
+                summaryDetail(currentTask, currentDetail);
             }
         } else {
             //不通过则回到第一阶段
@@ -1063,6 +1062,16 @@ public class DeviceCheckController {
         //2.办结待办
         taskService.moveToEnd(cityDoneTask);
 
+        //3.如果所有省级的子任务都完成了
+        boolean over = taskService.TaskTreeIsOver(cityTask.getParentTaskId());
+        if (over){
+            log.info("[核查模块] 所有的省级子任务都完成了，将省统计任务变为待办");
+            TaskBto provTask = taskService.get(cityTask.getParentTaskId());
+            provTask.getInvolveUserIdList().add(0);
+            provTask.setCurrentPoint(provTask.getCurrentPoint() + 1);
+            taskService.update(provTask);
+        }
+
         log.info("[核查模块] 办结统计待办操作成功");
         return ResponseEntity.ok(new ResultObj<>("办结统计待办确认完毕"));
     }
@@ -1155,9 +1164,10 @@ public class DeviceCheckController {
             //如果上一个id是-1 则证明是所有人的跟踪统计，即自动核查，那么下一步推进到所有人的跟踪,否则设置为-2,即维持跟踪者id
             Integer lastUserId = fatherTask.getLastUserId() == -1 ? -1 : -2;
             TaskBto newFatherTask = taskService.moveToNext(fatherTask, lastUserId);
-//            newFatherTask.getInvolveUserIdList().add(0);
-//            newFatherTask.setCurrentPoint(newFatherTask.getCurrentPoint() + 1);
-//            taskService.update(newFatherTask);
+            // 将父级的统计任务变为待办
+            newFatherTask.getInvolveUserIdList().add(0);
+            newFatherTask.setCurrentPoint(newFatherTask.getCurrentPoint() + 1);
+            taskService.update(newFatherTask);
         }
         log.info("[核查模块] 数据汇总完毕");
     }