refactor: 修改核查模块，市自动转发个区

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

@@ -469,6 +469,7 @@ public class DeviceCheckController {
 
                 for (Task child : childTask) {
                     // 将子节点任务中的 统计数据确认任务 给过滤掉
+                    // todo
                     if (child.getTitle().contains("统计数据确认任务")) {
                         continue;
                     }
@@ -583,7 +584,6 @@ public class DeviceCheckController {
                     // 这里只显示detail任务
                     if (child.getBusinessType() == CONFIRM_CHECK_STAT.id) {
 
-                        // todo
                         lcdList.add(LinkCheckDetail.builder()
                                 .checkResult("无误")
                                 .checkUnit(unitsRepo.findById(child.getOwnUnit()).get().getName())
@@ -591,7 +591,7 @@ public class DeviceCheckController {
                                 .id(child.getBillId())
                                 .remark(1)
                                 .build());
-                        break;
+                        continue;
                     }
 
                     LinkExamDetail led = getLed(endTime, updateTime, child);
@@ -625,6 +625,7 @@ public class DeviceCheckController {
      */
     @GetMapping("/title/{examJobId}")
     public ResponseEntity getNames(@PathVariable Integer examJobId) {
+
         // 根据检查的主键id 查询到prov city Stat的title
         Integer provId = taskService.get(examJobId).getParentTaskId();
         // 检查的job id 找到 father 进而找到 father的billid 进而找到title Id

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

@@ -16,10 +16,10 @@ public interface CheckUnitService {
     /**
      *  查询核查/检查的单位
      *  包括省级、省本级、市
-     * @param isCheck true_过滤掉省(检查用)，false_不过滤省（核查用）
+     * @param isExam true_过滤掉省(检查用)，false_不过滤省（核查用）
      * @return map
      */
-    Map<Integer, List<Units>> findCheckUnit(boolean isCheck);
+    Map<Integer, List<Units>> findCheckUnit(boolean isExam);
 
     List<Units> checkPossible(List<Integer> ids, boolean isCheck);
 

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

@@ -41,15 +41,14 @@ public class CheckUnitServiceImpl implements CheckUnitService {
     private AreaExhibitionDao AreaExRepo;
 
     @Override
-    public Map<Integer, List<Units>> findCheckUnit(boolean filter) {
+    public Map<Integer, List<Units>> findCheckUnit(boolean isExam) {
 
         // 1 构建省级单位集合
-        List<Units> provinceUnits = new ArrayList<>(unitsRepo
-                .findAllByTypeInAndLevelIn(new ArrayList<>(2), new ArrayList<>(1))
-                .orElse(Collections.emptyList()));
+        List<Units> provinceUnits = unitsRepo
+                .findAllByTypeAndLevel(2, 1);
 
         // 过滤省局，逻辑为:如果不过滤，就加上省局
-        if (!filter) {
+        if (!isExam) {
             List<Units> pro = unitsRepo.
                     findAllByTypeAndLevel(1, 1);
             provinceUnits.add(pro.get(0));
@@ -61,14 +60,19 @@ public class CheckUnitServiceImpl implements CheckUnitService {
 
         // 3 构建市
         List<Units> cityUnits = unitsRepo.findAllByLevel(2);
+        List<Units> checkCityUnits = new ArrayList<>();
 
-        if (filter) {
+        if (!isExam) {
             cityUnits.forEach(
-                    units -> units.setName(areaRepo.findNameById(units.getAreaId()))
+                    units -> {units.setName(areaRepo.findNameById(units.getAreaId()));
+                    checkCityUnits.add(units);
+                    }
             );
         }
 
-        return ImmutableMap.of(1, provinceUnits, 2, esAUnits, 3, cityUnits);
+        log.info("[核查] 查询市单位:{}", checkCityUnits);
+
+        return ImmutableMap.of(1, provinceUnits, 2, esAUnits, 3, isExam ? cityUnits : checkCityUnits);
     }
 
     @Override