feat(核查模块): 任务名称更改为单位简称+时间

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

@@ -473,7 +473,7 @@ public class DeviceCheckController {
                 finalSituation = "进行中";
             }
         }
-        
+
         lcd.setCheckSituation(finalSituation);
 
         // 核查情况  所有子任务都是初始状态 = 无 10=未
@@ -713,6 +713,19 @@ public class DeviceCheckController {
         return ResponseEntity.ok(ImmutableMap.of("empty", findEmpty, "msg", alertString));
     }
 
+    private String getUnitDateString(Units units){
+        LocalDate now = LocalDate.now();
+        int monthValue = now.getMonthValue();
+        String monthString = "";
+        if (monthValue < 10){
+            monthString = "0" + monthValue;
+        }else {
+            monthString = "" + monthValue;
+        }
+        return units.getUnitDesc() + monthString + now.getDayOfMonth();
+
+    }
+
     @ApiOperation(value = "发起核查", notes = "对指定单位发起核查任务")
     @PostMapping("/startCheck")
     public ResponseEntity startCheck(@RequestBody CheckCheckVo ccVO) {
@@ -735,7 +748,7 @@ public class DeviceCheckController {
                 .collect(toList());
 
         // 构建省的统计任务
-        TaskBto provStatTask = new Task(CHECK_STAT_1.id, "省" + CONFIRM_CHECK_STAT.name, 0, ".0.", CONFIRM_CHECK_STAT.id, statId, startUnitId)
+        TaskBto provStatTask = new Task(CHECK_STAT_1.id, getUnitDateString(startUnit), 0, ".0.", CONFIRM_CHECK_STAT.id, statId, startUnitId)
                 .parse2Bto();
         provStatTask.getInvolveUserIdList().add(authenticationUtils.getAuthentication().getCurrentUserInfo().getUserId());
         provStatTask.getInvolveUserIdList().add(-1);
@@ -760,7 +773,7 @@ public class DeviceCheckController {
             log.info("[核查模块] {} 检查统计账单构建完毕,id 为 {}", unit.getName(), cityStatId);
 
             // 构建市的统计任务
-            TaskBto cityStatTask = new TaskBto(CHECK_EXAM_STAT_0.id, unit.getName() + "检查统计任务", provStatTask.getId(), addNode(provStatTask.getNodeIdDetail(), provStatTask.getId()), CONFIRM_CHECK_STAT.id, cityStatId, unit.getUnitId(), 0);
+            TaskBto cityStatTask = new TaskBto(CHECK_EXAM_STAT_0.id, getUnitDateString(unit), provStatTask.getId(), addNode(provStatTask.getNodeIdDetail(), provStatTask.getId()), CONFIRM_CHECK_STAT.id, cityStatId, unit.getUnitId(), 0);
             cityStatTask.getInvolveUserIdList().add(0);
             cityStatTask.setCurrentPoint(1);
             cityStatTask.setCustomInfo("exam");
@@ -832,7 +845,7 @@ public class DeviceCheckController {
                 ownUnitId = unit.getUnitId();
             }
 
-            TaskBto checkedTask = new TaskBto(initStatusId, unit.getName() + "自核查任务", fatherId, addNode(provStatTask.getNodeIdDetail(), provStatTask.getId()), CONFIRM_CHECK_DETAIL.id, detail.getId(), ownUnitId, 0);
+            TaskBto checkedTask = new TaskBto(initStatusId, getUnitDateString(unit), fatherId, addNode(provStatTask.getNodeIdDetail(), provStatTask.getId()), CONFIRM_CHECK_DETAIL.id, detail.getId(), ownUnitId, 0);
             checkedTask.setCustomInfo("manual");
             taskService.start(checkedTask);
         }
@@ -906,7 +919,7 @@ public class DeviceCheckController {
         Integer currentUserId = authenticationUtils.getAuthentication().getCurrentUserInfo().getUserId();
         TaskBto cityStatTask;
         if (ceVo.getExamStatId() == 0) {
-            cityStatTask = new Task(CHECK_EXAM_STAT_1.id, CHECK_EXAM_STAT_0.name, 0, ".0.", CONFIRM_CHECK_STAT.id, statId, startUnitId)
+            cityStatTask = new Task(CHECK_EXAM_STAT_1.id, getUnitDateString(startUnit), 0, ".0.", CONFIRM_CHECK_STAT.id, statId, startUnitId)
                     .parse2Bto();
 //            cityStatTask.setRemark(String.valueOf(CHECK_EXAM_STAT_1.id));
             cityStatTask.setCustomInfo("exam");
@@ -984,7 +997,7 @@ public class DeviceCheckController {
 
                 // 3-2   构建被查单位的 自查任务 (根据被查单位的级别来区分是县级状态是市级状态)
 
-                TaskBto checkedTask = new TaskBto(initTaskStatusId, "自核查任务", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, detail.getId(), unit.getUnitId(), 0);
+                TaskBto checkedTask = new TaskBto(initTaskStatusId,getUnitDateString(unit), cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, detail.getId(), unit.getUnitId(), 0);
 //                checkedTask.setRemark(String.valueOf(CHECK_EXAM_DETAIL_0.id));
                 checkedTask.setCustomInfo("manual");
                 checkedTask = taskService.start(checkedTask);
@@ -1565,12 +1578,13 @@ public class DeviceCheckController {
 
         if (hasParent) {
             //市统计的办结 -> 开启对应市 数据确认任务for 省
+            Units units = unitsRepo.findById(currentTask.getOwnUnit()).get();
             String areaName = auService.findOne(AuExample.UnitId, currentTask.getOwnUnit()).getName();
             Integer provId = areaRepo.findAreasByType(1).stream()
                     .min(Comparator.comparing(Area::getId))
                     .get()
                     .getId();
-            TaskBto cityDoneTask = new TaskBto(CONFIRM_STAT_0.id, areaName + "统计数据确认任务", parentTaskId, ".", CONFIRM_CHECK_STAT.id, statId, provId, 0);
+            TaskBto cityDoneTask = new TaskBto(CONFIRM_STAT_0.id, getUnitDateString(units) + "统计数据确认任务", parentTaskId, ".", CONFIRM_CHECK_STAT.id, statId, provId, 0);
             cityDoneTask.getInvolveUserIdList().add(0);
             cityDoneTask.setCurrentPoint(cityDoneTask.getCurrentPoint() + 1);
             cityDoneTask = taskService.start(cityDoneTask);