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

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/common/UnitAreaBean.java

@@ -27,6 +27,7 @@ public class UnitAreaBean {
     @Autowired
     private UnitsDao unitsDao;
 
+
     @Bean(name = "unMap")
     public Map<String, AreaUnit> unitNameMap() {
         return unitsDao.findAll().stream()

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

@@ -1195,6 +1195,8 @@ public class DeviceCheckController {
             return ResponseEntity.status(400).body(new ResultObj<>("checkStatus不应该为0!"));
         }
 
+        detailRepo.updateCheckUserCDE(id,checkUserCName,checkUserDName,checkUserEName);
+
         //先更新checkUser
         if (checkUserAId > 0 && checkUserBId > 0) {
             detailRepo.updateCheckUserAbc(id, checkUserAId, checkUserBId, checkUserCName,checkUserDName,checkUserEName);
@@ -1362,20 +1364,25 @@ public class DeviceCheckController {
         Set<String> unitNames = new HashSet<>();
 
         for (Task c1 : l1Childs) {
-            if (predNodeType(c1).equals(CcNodeType.EXAM)) {
+            if (predNodeType(c1).equals(CcNodeType.EXAM) || predNodeType(c1).equals(CcNodeType.CHECK)) {
                 List<Task> detailTaskList = taskRepo.findAllByParentTaskId(c1.getId());
                 if (detailTaskList.isEmpty()) {
-                    unitNames.add(unitsRepo.findById(c1.getOwnUnit()).get().getName());
+//                    unitNames.add(unitsRepo.findById(c1.getOwnUnit()).get().getName());
+                    unitNames.add(detailRepo.findById(c1.getBillId()).get().getCheckUnit());
                 } else {
-                    List<String> notEndUnitNames = detailTaskList
-                            .stream().filter(task -> !task.getBillStatus().equals(END.id))
-                            .map(task -> unitsRepo.findById(task.getOwnUnit()).get().getName())
-                            .collect(toList());
+//                    List<String> notEndUnitNames = detailTaskList
+//                            .stream().filter(task -> !task.getBillStatus().equals(END.id))
+//                            .map(task -> unitsRepo.findById(task.getOwnUnit()).get().getName())
+//                            .collect(toList());
+                    List<String> notEndUnitNames = detailRepo.findAllById(detailTaskList.stream().map(Task::getBillId).collect(toList()))
+                            .stream().map(DeviceCheckDetail::getCheckUnit).collect(toList());
+
                     unitNames.addAll(notEndUnitNames);
                 }
             } else if (predNodeType(c1).equals(CcNodeType.MANUAL) && !c1.getBillStatus().equals(END.id)) {
-                String unitName = unitsRepo.findById(c1.getOwnUnit()).get().getName();
-                unitNames.add(unitName);
+                String checkUnit = detailRepo.findById(c1.getBillId()).get().getCheckUnit();
+//                String unitName = unitsRepo.findById(c1.getOwnUnit()).get().getName();
+                unitNames.add(checkUnit);
             }
         }
 

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

@@ -450,7 +450,7 @@ public class ExamController {
 
                 // 3-1-2 构建市单位的任务
                 TaskBto taskBtoCity = new Task(CHECK_EXAM_STAT_1.id,
-                        getUnitDateString(startUnit, "各市单位检查任务"),
+                        "[地方市单位]" + ceVo.getTitle(),
                         cityStatTask.getId(), ".0.", CONFIRM_CHECK_STAT.id, cityStatSave.getId(),
                         unitsRepo.findAllByTypeAndLevel(1, 1).get(0).getUnitId()).parse2Bto();
                 taskBtoCity.setCustomInfo("exam");

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

@@ -91,9 +91,20 @@ public class CheckDetailVo {
      * 审核人
      */
     @ApiModelProperty(value = "checkC")
-    @Column(name = "checkC_name")
     private String checkCName = "";
 
+    /**
+     * 审核人
+     */
+    @ApiModelProperty(value = "checkCD")
+    private String checkDName = "";
+
+    /**
+     * 审核人
+     */
+    @ApiModelProperty(value = "checkE")
+    private String checkEName = "";
+
     /**
      * 核查时间
      */

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/repository/DeviceCheckDetailDao.java

@@ -63,4 +63,16 @@ public interface DeviceCheckDetailDao extends JpaRepository<DeviceCheckDetail, I
     @Modifying
     @Query("update DeviceCheckDetail o set o.checkUserAId =?2,o.checkUserBId=?3, o.checkCName = ?4,o.checkDName = ?5,o.checkEName = ?6 where o.id =?1")
     void updateCheckUserAbc(int id, int checkUserAId, int checkUserBId, String checkCName,String checkDName,String checkEName);
+
+    /**
+     * 更新 代管单位的经办人、检查人、审核人
+     * @param id
+     * @param checkCName
+     * @param checkDName
+     * @param checkEName
+     */
+    @Modifying
+    @Query("update DeviceCheckDetail o set o.checkCName = ?2,o.checkDName = ?3,o.checkEName = ?4 where o.id =?1")
+    void updateCheckUserCDE(int id,String checkCName,String checkDName,String checkEName);
+
 }