refactor: 修改核查模块(重构)

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

@@ -445,8 +445,11 @@ public class DeviceCheckController {
         } else {
             // 正常处理，即时计算
             // checkType = 0 核查，checkType = 1 检查
-            if (ctVo.getCheckType() == 0) {
-                linkVo.setType(1);
+            if (ctVo.getCheckType() == 0 || (ctVo.getCheckType() == 1 && unitsService.isProvUnit(rootTask.getOwnUnit()))) {
+
+                if (ctVo.getCheckType() == 0 ) {
+                    linkVo.setType(1);
+                }
                 // 根据tpye和billId找到父级节点 - 默认了最顶级的省核查节点应当为一个
 
                 // 先检出所有类型为7或者8的Task集合 方便后续操作
@@ -590,14 +593,11 @@ public class DeviceCheckController {
                 log.info("[TEST] COST {} MS", finalTime - startTime);
             }
             // check type = 1 检查页面 看见的是自查 1=省核查,2=省检查,3=3级结构下的市检查,4=2级结构下的市检查
-            if (ctVo.getCheckType() == 1) {
+            if (ctVo.getCheckType() == 1 && !unitsService.isProvUnit(rootTask.getOwnUnit())) {
+
                 Integer createUserId = ctVo.getCreateUserId();
                 Integer ownUnit = rootTask.getOwnUnit();
-                if (unitsService.isProvUnit(ownUnit)) {
-                    linkVo.setType(2);
-                } else {
                     linkVo.setType(4);
-                }
 
                 // 找到所有的子节点
                 List<Task> childTask = taskRepo.findAllByParentTaskId(rootTask.getId());
@@ -1085,6 +1085,7 @@ public class DeviceCheckController {
     public ResponseEntity<ResultObj> checkUserA(@PathVariable Integer id,
                                                 @RequestParam int assignUserId,
                                                 @RequestParam String checkResult,
+                                                // todo
                                                 @RequestParam String terminalInfo,
                                                 @RequestBody DetailVo detailVo) {
         // 获取参数
@@ -1288,6 +1289,7 @@ public class DeviceCheckController {
             currentDetail.setUserCId(userId);
             currentDetail = detailRepo.save(currentDetail);
             summaryDetail(currentTask, currentDetail);
+
 //            // 检查该exam任务是否可以完结推进了
             advanceExamTask(currentTask.getParentTaskId(), false);
 
@@ -1846,7 +1848,9 @@ public class DeviceCheckController {
         log.info("[核查模块] 终止任务-正在关闭 task id = {} 的任务节点");
         // 如果是核查类捡点，抛出异常
         if (node.getCustomInfo().equals("check") || node.getCustomInfo().equals("exam")) {
-            throw new ApiException("关闭节点里不处理核查/核查节点...,你提供的任务节点id = " + node.getId());
+//            throw new ApiException("关闭节点里不处理核查/核查节点...,你提供的任务节点id = " + node.getId());
+            log.error("关闭节点里不处理核查/核查节点...,你提供的任务节点id = " + node.getId());
+            return;
         }
         //  其余节点,执行关闭策略
         // 1.将该任务进度推进至9999

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

@@ -587,6 +587,7 @@ public class ExamController {
             // a 构建区单位的自查账单及任务
             List<Units> unitsEs = checkedUnits.stream().filter(o -> o.getLevel() == 3).collect(toList());
             log.info("[核查] 检查，生成区的统计及详情:{}", unitsEs.toString());
+            unitsEs = unitsRepo.findAllById(checkUnitService.findExistDevice(unitsEs.stream().map(Units::getUnitId).collect(toList())));
 
             for (Units unit : unitsEs) {
 

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/ConfirmCheckServiceImpl.java

@@ -323,7 +323,6 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
     @Override
     public Page<CheckStatTableVo> findAllStatTable(CheckBillSelectVo checkBillSelectVo) {
 
-
         //过滤出顶级节点 过滤逻辑是1.自己就是父节点2.自己的customInfo = exam or check
         List<TaskBto> topStatList = taskService.findBillType(7);
 

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

@@ -51,7 +51,6 @@ import static java.util.stream.Collectors.*;
  * @author Matrix <xhyrzldf@gmail.com>
  * @since 2020/8/17 at 8:45 下午
  */
-@SuppressWarnings("ALL")
 @Slf4j
 @Component
 public class ObjTransUtil {
@@ -148,9 +147,9 @@ public class ObjTransUtil {
         childTask = childTask.stream()
                 .filter(task -> !task.getTitle().contains("统计数据待办任务"))
                 .filter(task -> !task.getTitle().contains("统计数据确认任务"))
-                .collect(groupingBy(Task::getOwnUnit,
-                        collectingAndThen(maxBy(Comparator.comparing(Task::getId)), Optional::get)))
-                .values().stream()
+//                .collect(groupingBy(Task::getOwnUnit,
+//                        collectingAndThen(maxBy(Comparator.comparing(Task::getId)), Optional::get)))
+//                .values().stream()
                 .collect(toList());
 
         long total = childTask.size();
@@ -171,7 +170,12 @@ public class ObjTransUtil {
                 } else {
                     // confirmTaskidDone 为true 代表此时等待最后的father任务 为false代表 flag = false 且isDone为false 代表整个节点里没有确认节点直接完结
                     if (fatherTask.getBillStatus().equals(END.id) || fatherTask.getBillStatus().equals(CHECK_SHUT_DOWN.id)) {
-                        completion = "核查完成";
+
+                        if (stat.getCheckType() == CheckType.CT_CHECK) {
+                            completion = "核查完成";
+                        } else {
+                            completion = "检查完成";
+                        }
                     } else {
                         completion = "核查完成待办结";
                     }

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TestPaperServiceImpl.java

@@ -133,10 +133,10 @@ public class TestPaperServiceImpl implements TestPaperService {
     @Override
     public TestPaper generateTestPaper(GenerateTestPaper generateTestPaper) {
         TestPaper testPaper=new TestPaper();
-//        testPaper.setChooseProblemList(problemService.findByTypeAndLevel(1,1));
-//        testPaper.setJudgeProblemList(problemService.findByTypeAndLevel(2,1));
-//        testPaper.setMultipleChoiceProblemList(problemService.findByTypeAndLevel(4,1));
-//        testPaper.setShortAnswerProblemList(problemService.findByTypeAndLevel(3,1));
+//        testPaper.setChooseProblemList(problemService.findAllByTypeAndLevel(1,1));
+//        testPaper.setJudgeProblemList(problemService.findAllByTypeAndLevel(2,1));
+//        testPaper.setMultipleChoiceProblemList(problemService.findAllByTypeAndLevel(4,1));
+//        testPaper.setShortAnswerProblemList(problemService.findAllByTypeAndLevel(3,1));
 //        generateTestPaper.
         List<ProblemVo> chooseList=new ArrayList<>();
         List<ProblemVo> judgeProblemList=new ArrayList<>();