[核查模块] 修正了区没有装备的处理情况的问题

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

@@ -483,6 +483,21 @@ public class DeviceCheckController {
         return new ResultObj<>(resultIds, "自动核查任务发起成功");
     }
 
+    @ApiOperation(value = "根据地区ID获取下级的单位", notes = "根据地区ID获取下级的单位")
+    @GetMapping("/under/{areaId}")
+    public ResponseEntity getUnitsUnderAreaId(@PathVariable Integer areaId){
+        //1.获取child AreaId List
+        List<Integer> areaIds = areaRepo.findAllByFatherId(areaId).stream()
+                .map(Area::getId)
+                .collect(toList());
+
+        //2. 根据childId 获得对应的unit
+        List<Units> unitsList = unitsRepo.findAllByAreaIdIn(areaIds);
+
+        return ResponseEntity.ok(unitsList);
+
+    }
+
     @ApiOperation(value = "检查地区是否发起核查", notes = "检查地区是否发起核查")
     @PostMapping("/checkPossible")
     public ResponseEntity checkPossible(@RequestBody UnitIds uuid){
@@ -657,8 +672,8 @@ public class DeviceCheckController {
         }
         String groupUserString = tmpString.stream().collect(joining("|"));
 
-        List<Integer> areaIds = examDetailVos.stream().map(CheckExamDetailVo::getAreaId).collect(toList());
-        List<Units> checkedUnits = unitsRepo.findByAreaIdIn(areaIds);
+        List<Integer> unitIds = examDetailVos.stream().map(CheckExamDetailVo::getUnitId).collect(toList());
+        List<Units> checkedUnits = unitsRepo.findAllById(unitIds);
         List<String> checkedUnitNames = checkedUnits.stream().map(Units::getName).collect(toList());
 
         // 2-1 构建发起单位的 统计账单
@@ -675,7 +690,7 @@ public class DeviceCheckController {
         }
 
 
-        log.info("[核查模块]发起手动核查，发起单位为{},被查单位为{}", startUnit.getName(), checkedUnitNames);
+        log.info("[核查模块]发起手动检查，发起单位为{},被查单位为{}", startUnit.getName(), checkedUnitNames);
 
         provinceCheckStat.setCheckType(CheckType.CT_EXAM);
         Integer statId = statRepo.save(provinceCheckStat).getId();
@@ -717,7 +732,7 @@ public class DeviceCheckController {
         // 3. 构建被核查单位的详情账单与Task
         // 对每个需要核查的单位构建其detail账单与task
         for (CheckExamDetailVo ed : examDetailVos) {
-            Units unit = unitsRepo.findByAreaId(ed.getAreaId()).get(0);
+            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<>()));
@@ -1139,7 +1154,10 @@ public class DeviceCheckController {
             TaskBto fatherTask = taskService.get(fatherTaskId);
             //如果上一个id是-1 则证明是所有人的跟踪统计，即自动核查，那么下一步推进到所有人的跟踪,否则设置为-2,即维持跟踪者id
             Integer lastUserId = fatherTask.getLastUserId() == -1 ? -1 : -2;
-            taskService.moveToNext(fatherTask, lastUserId);
+            TaskBto newFatherTask = taskService.moveToNext(fatherTask, lastUserId);
+//            newFatherTask.getInvolveUserIdList().add(0);
+//            newFatherTask.setCurrentPoint(newFatherTask.getCurrentPoint() + 1);
+//            taskService.update(newFatherTask);
         }
         log.info("[核查模块] 数据汇总完毕");
     }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckExamDetailVo.java

@@ -27,7 +27,7 @@ public class CheckExamDetailVo {
     private List<String> userNames;
 
     @ApiModelProperty(name = "需要被检查的区域id")
-    private Integer areaId;
+    private Integer unitId;
 
     @ApiModelProperty(name = "备注")
     private String remark;

dev-file/src/main/java/com/tykj/dev/device/file/service/Impl/PdfServiceImpl.java

@@ -37,7 +37,7 @@ public class PdfServiceImpl implements PdfService {
     }
 
     private DocumentDevice toDocDev(ScriptSaveVo scriptSaveVo){
-       return new DocumentDevice(null,scriptSaveVo.getModel(),null,scriptSaveVo.getType(),scriptSaveVo.getSecretLevel(),scriptSaveVo.getInvisibleRange(),scriptSaveVo.getNum(),scriptSaveVo.getSeqNumber(),null,scriptSaveVo.getRemark(),null);
+       return new DocumentDevice(null,scriptSaveVo.getModel(),null,scriptSaveVo.getType(),scriptSaveVo.getSecretLevel(),scriptSaveVo.getInvisibleRange(),scriptSaveVo.getNum(),scriptSaveVo.getSeqNumber(),null,scriptSaveVo.getRemark(),null,null);
     }
 
 }