fix(核查模块): 修复了省直属单位的待办与统计问题

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

@@ -673,8 +673,6 @@ public class DeviceCheckController {
 
         if (!situation.contains("完成")) {
             checkResult = "无";
-        } else if (areaType == 1) {
-            checkResult = "无误";
         } else if (comSituation == 10) {
             // 再判断一下 是2级结构(检查统计)还是3级结构(核查统计)
             Integer rootId = taskService.findByTaskId(task.getParentTaskId()).getParentTaskId();
@@ -942,7 +940,11 @@ public class DeviceCheckController {
             Integer initStatusId = 0;
 
             // level = 1 或者2 市省级 否则 就是区级 ，市省级的自查初始状态160，区级的自查初始状态140
-            if (unit.getLevel() == 1 || unit.getLevel() == 2) {
+            // type = 2 160 ，tpye = 1 && level = 1 || level = 2 160
+            boolean directProv = unit.getType() == 2;
+            boolean normalProv = unit.getType() == 1 && (unit.getLevel() == 1 || unit.getLevel() == 2);
+
+            if (directProv || normalProv) {
                 fatherId = cityExamIdMap.get(unit.getUnitId());
                 initStatusId = CHECK_DETAIL_CITY_0.id;
                 if (fatherId == null) {
@@ -970,9 +972,12 @@ public class DeviceCheckController {
 
             // 3-2  构建被查单位的 自查任务 (根据被查单位的级别来区分是县级状态是市级状态) 这里的父级任务应该是省统计
 
-            //处理ownUnit的代码 - 用于处理没有账号的单位的可见性
+            //处理ownUnit的代码 - 如果省直属有账号发给省直属的，没有账号就发给省做 用于处理没有账号的单位的可见性
             Integer ownUnitId = 0;
-            if (unit.getType() == 2) {
+            List<User> userList = userService.findAllByUnite(unit.getUnitId());
+            boolean notHasAccount = userList.size() == 0;
+
+            if (unit.getType() == 2 && notHasAccount) {
                 ownUnitId = 1;
             } else {
                 ownUnitId = unit.getUnitId();
@@ -1554,8 +1559,12 @@ public class DeviceCheckController {
         // 老的stat要去除掉对应areaName的数据
         removeDetailFromDcs(detail, dcs);
 
-        //4.父级任务变为进行中
-        fatherTask.setBillStatus(CHECK_EXAM_STAT_1.id);
+        //4.父级任务变为进行中 如果父级是核查，变成111，如果父级是检查，变成131
+        if (fatherTask.getCustomInfo().contains("exam")){
+            fatherTask.setBillStatus(CHECK_EXAM_STAT_1.id);
+        }else if (fatherTask.getCustomInfo().contains("check")){
+            fatherTask.setBillStatus(CHECK_STAT_1.id);
+        }
         taskRepo.save(fatherTask.toDo());
 
         return ResponseEntity.ok(new ResultObj<>("回退操作成功!"));
@@ -1573,6 +1582,7 @@ public class DeviceCheckController {
         DeviceCheckDetail detail = detailRepo.findById(id).get();
         String updatedString = changeHunds(detail.getCheckDetail(), 2);
         detail.setCheckDetail(updatedString);
+        detail.setUserCId(authenticationUtils.getAuthentication().getCurrentUserInfo().getUserId());
         log.info("[核查模块] 审核通过 - 更新后的detailString形如 {}", updatedString.split(",")[0]);
         detailRepo.save(detail);