feat(核查模块): 完成了核查模块的回退功能

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -107,23 +107,19 @@ public enum LogType {
 
     TRAIN_1(46,TRAIN.id, ORIGIN_STATUS.id, TRAIN1000.id, "发起培训"),
 
-    CONFIRM_CHECK_DETAIL_NORMAL_0(401,CONFIRM_CHECK_DETAIL.id, ORIGIN_STATUS.id, CHECK_DETAIL_0.id, "核查详情任务开始"),
+    CONFIRM_CHECK_DETAIL_NORMAL_0(401,CONFIRM_CHECK_DETAIL.id, ORIGIN_STATUS.id, CHECK_DETAIL_REGION_0.id, "核查详情任务开始"),
 
-    CONFIRM_CHECK_DETAIL_NORMAL_1(402,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_0.id, CHECK_DETAIL_1.id, "A岗核查成功,等待专管员B操作"),
+    CONFIRM_CHECK_DETAIL_NORMAL_1(402,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_REGION_0.id, CHECK_DETAIL_REGION_1.id, "A岗核查成功,等待专管员B操作"),
 
-    CONFIRM_CHECK_DETAIL_NORMAL_2(403,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_1.id, CHECK_DETAIL_2.id, "B岗核查成功,等待核查组成员A审核"),
+    CONFIRM_CHECK_DETAIL_NORMAL_2(403,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_REGION_1.id, CHECK_DETAIL_REGION_2.id, "B岗核查成功,等待核查组成员A审核"),
 
-    CONFIRM_CHECK_DETAIL_NORMAL_3(404,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_2.id, CHECK_DETAIL_3.id, "核查组成员A核查成功,等待核查组成员B审核"),
+    CONFIRM_CHECK_DETAIL_NORMAL_3(404,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_REGION_2.id, END.id, "市专管员审核成功，该自查任务完结"),
 
-    CONFIRM_CHECK_DETAIL_NORMAL_4(405,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_3.id, END.id, "核查组成员B核查成功,任务结束,上传数据到统计信息"),
+    CONFIRM_CHECK_DETAIL_OTHER_1(406,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_REGION_1.id, END.id, "B岗核查成功,该任务没有核查组成员,任务结束,上传数据到统计信息"),
 
-    CONFIRM_CHECK_DETAIL_OTHER_1(406,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_1.id, END.id, "B岗核查成功,该任务没有核查组成员,任务结束,上传数据到统计信息"),
+    CONFIRM_CHECK_DETAIL_OTHER_2(407,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_REGION_1.id, CHECK_DETAIL_REGION_0.id, "B岗审核失败,跳回区A岗人员操作"),
 
-    CONFIRM_CHECK_DETAIL_OTHER_2(407,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_1.id, CHECK_DETAIL_0.id, "B岗审核失败,跳回A岗人员操作"),
-
-    CONFIRM_CHECK_DETAIL_OTHER_3(408,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_2.id, CHECK_DETAIL_0.id, "核查组成员A审核失败,跳回A岗人员操作"),
-
-    CONFIRM_CHECK_DETAIL_OTHER_4(409,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_3.id, CHECK_DETAIL_0.id, "核查组成员B审核失败,跳回A岗人员操作"),
+    CONFIRM_CHECK_DETAIL_OTHER_3(408,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_REGION_2.id, CHECK_DETAIL_REGION_0.id, "市专管员审核失败,跳回区A岗人员操作"),
 
     CONFIRM_CHECK_DETAIL_STAT_0(410,CONFIRM_CHECK_STAT.id, ORIGIN_STATUS.id, CHECK_STAT_0.id, "核查统计任务开始"),
 
@@ -137,20 +133,33 @@ public enum LogType {
 
     CONFIRM_CHECK_EXAM_STAT_2(415, CONFIRM_CHECK_STAT.id, CHECK_EXAM_STAT_1.id, END.id, "检查统计任务数据已确认完毕，任务完结"),
 
-    CONFIRM_CHECK_EXAM_DETAIL_0(416, CONFIRM_CHECK_DETAIL.id, ORIGIN_STATUS.id, CHECK_EXAM_DETAIL_0.id, "检查详情任务开始"),
+    CONFIRM_CHECK_EXAM_DETAIL_0(416, CONFIRM_CHECK_DETAIL.id, ORIGIN_STATUS.id, CHECK_DETAIL_REGION_0.id, "检查详情任务开始"),
 
-    CONFIRM_CHECK_EXAM_DETAIL_1(417, CONFIRM_CHECK_DETAIL.id, CHECK_EXAM_DETAIL_0.id, CHECK_EXAM_DETAIL_1.id, "A岗核查成功,等待专管员B操作"),
+    CONFIRM_CHECK_EXAM_DETAIL_1(417, CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_REGION_0.id, CHECK_DETAIL_REGION_1.id, "A岗核查成功,等待专管员B操作"),
 
-    CONFIRM_CHECK_EXAM_DETAIL_2(418, CONFIRM_CHECK_DETAIL.id, CHECK_EXAM_DETAIL_1.id, END.id, "专管员B核查成功,该地区的检查任务结束了"),
+    CONFIRM_CHECK_EXAM_DETAIL_2(418, CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_REGION_1.id, END.id, "专管员B核查成功,该地区的检查任务结束了"),
 
-    CONFIRM_CHECK_EXAM_DETAIL_3(419, CONFIRM_CHECK_DETAIL.id, CHECK_EXAM_DETAIL_1.id, CHECK_EXAM_DETAIL_0.id, "B岗审核失败,跳回A岗人员操作"),
+    CONFIRM_CHECK_EXAM_DETAIL_3(419, CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_REGION_1.id, CHECK_DETAIL_REGION_0.id, "B岗审核失败,跳回A岗人员操作"),
 
     CONFIRM_CHECK_EXAM_STAT_3(420, CONFIRM_CHECK_DETAIL.id, CHECK_EXAM_STAT_0.id, END.id, "检查统计任务数据已确认完毕，任务完结"),
 
-    CONFIRM_CHECK_SELF_ROLLBACK(421, CONFIRM_CHECK_DETAIL.id,  END.id,CHECK_EXAM_DETAIL_0.id, "自查任务已退回至等待专管员A处理状态"),
+    CONFIRM_CHECK_SELF_ROLLBACK(421, CONFIRM_CHECK_DETAIL.id,  END.id,CHECK_DETAIL_REGION_0.id, "自查任务已退回至等待专管员A处理状态"),
 
     CONFIRM_CHECK_EXAM_ROLLBACK(422, CONFIRM_CHECK_DETAIL.id,  END.id,CHECK_EXAM_STAT_1.id, "检查任务已退回至等待确认状态"),
 
+    CONFIRM_CHECK_EXAM_CITY_DETAIL_0(423, CONFIRM_CHECK_DETAIL.id, ORIGIN_STATUS.id, CHECK_DETAIL_CITY_0.id, "检查详情任务开始"),
+
+    CONFIRM_CHECK_EXAM_CITY_DETAIL_1(424, CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_CITY_0.id, CHECK_DETAIL_CITY_1.id, "专管员A操作成功,等待专管员B操作"),
+
+    CONFIRM_CHECK_EXAM_CITY_DETAIL_REDO(425, CONFIRM_CHECK_DETAIL.id, END.id, CHECK_DETAIL_CITY_0.id, "检查详情任务开始重做"),
+
+    CONFIRM_CHECK_EXAM_CITY_VERIFY_DONE(426, CONFIRM_CHECK_DETAIL.id, CONFIRM_STAT_0.id, END.id, "市统计数据确认完毕"),
+
+    CONFIRM_CHECK_EXAM_CITY_DETAIL_DONE(427, CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_CITY_1.id, END.id, "专管员B处理完毕"),
+
+
+
+
     ALLOT_BACK_1(57, ALLOT_BACK.id, ORIGIN_STATUS.id, ALLOT_BACKING.id, "发起装备退回"),
 
     ALLOT_BACK_2(58,ALLOT_BACK.id, ALLOT_BACKING.id, END.id, "接收退回装备并上传相关单据"),

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

+package com.tykj.dev.device.confirmcheck.common;
+
+import com.tykj.dev.config.Log;
+import com.tykj.dev.misc.base.StatusEnum;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.tykj.dev.misc.base.StatusEnum.*;
+
+/**
+ * CheckChart. 里面用于存放核查模块要用到的一些对照表Map
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2021/8/19 at 3:14 下午
+ */
+@Data
+@Slf4j
+public class CheckChart {
+
+
+    /**
+     * key = 任务状态编号 , value = 核查情况 , 用于市区自核查页面
+     */
+    public static Map<Integer, String> taskStatus2Situation = new HashMap<>();
+
+    static {
+        taskStatus2Situation.put(CHECK_DETAIL_CITY_0.id, "无");
+        taskStatus2Situation.put(CHECK_DETAIL_CITY_1.id, "进行中");
+        taskStatus2Situation.put(CHECK_DETAIL_REGION_0.id, "无");
+        taskStatus2Situation.put(CHECK_DETAIL_REGION_1.id, "进行中");
+        taskStatus2Situation.put(CHECK_DETAIL_REGION_2.id, "等待市审核");
+        taskStatus2Situation.put(END.id, "完成");
+        log.info("[核查模块] 初始化taskStatus2Situation 完毕 , size = {}",CheckChart.taskStatus2Situation.size());
+    }
+
+
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckDetail.java

@@ -128,7 +128,7 @@ public class DeviceCheckDetail extends BaseEntity {
     private String remark;
 
     /**
-     * 预留字段2
+     * 预留字段2 现在用来记录该自查任务的初始状态号
      */
     @ApiModelProperty(value = "预留字段2")
     private String var2;

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

@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -27,12 +28,12 @@ public class CheckExamDetailVo {
     private List<String> userNames;
 
     @ApiModelProperty(name = "需要被检查的区域id")
-    private Integer unitId;
+    private List<Integer> unitIds;
 
     @ApiModelProperty(name = "备注")
     private String remark;
 
     public CheckExamDetailVo copy(Integer unitId,String remark) {
-        return new CheckExamDetailVo(this.groupName, this.userNames, unitId, remark);
+        return new CheckExamDetailVo(this.groupName, this.userNames, Collections.singletonList(unitId), remark);
     }
 }

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

@@ -57,7 +57,7 @@ import java.util.stream.Collectors;
 
 import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_DETAIL;
 import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_STAT;
-import static com.tykj.dev.misc.base.StatusEnum.CHECK_DETAIL_0;
+import static com.tykj.dev.misc.base.StatusEnum.CHECK_DETAIL_REGION_0;
 import static com.tykj.dev.misc.base.StatusEnum.CHECK_STAT_0;
 import static java.util.stream.Collectors.*;
 
@@ -210,7 +210,7 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
                     .collect(toList());
             statVoList.addAll(cityStatVoList);
             // 构建市自查TASK
-            TaskBto cityDetailTask = new TaskBto(CHECK_DETAIL_0.id, cityUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, cityDetail.getId(), cityUnit.getUnitId(), 0);
+            TaskBto cityDetailTask = new TaskBto(CHECK_DETAIL_REGION_0.id, cityUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, cityDetail.getId(), cityUnit.getUnitId(), 0);
             cityDetailTask.setCustomInfo("auto");
             cityDetailTask = taskService.start(cityDetailTask);
             resultIds.get("taskId").add(cityDetailTask.getId());
@@ -236,7 +236,7 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
                 statVoList.addAll(countyStatVoList);
 
                 //构建县自查TASK
-                TaskBto countyDetailTask = new TaskBto(CHECK_DETAIL_0.id, countyUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, countyDetail.getId(), countyUnit.getUnitId(), 0);
+                TaskBto countyDetailTask = new TaskBto(CHECK_DETAIL_REGION_0.id, countyUnit.getName() + "自动核查自查", cityStatTask.getId(), addNode(cityStatTask.getNodeIdDetail(), cityStatTask.getId()), CONFIRM_CHECK_DETAIL.id, countyDetail.getId(), countyUnit.getUnitId(), 0);
                 countyDetailTask.setCustomInfo("auto");
                 countyDetailTask = taskService.start(countyDetailTask);
                 resultIds.get("taskId").add(countyDetailTask.getId());

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -47,19 +47,23 @@ public enum StatusEnum {
     CHECK_STAT_1(111, "统计数据等待确认"),
 
 
-    //以下为detail状态
+    //以下为 区自查detail状态
     CHECK_DETAIL_0(120, "等待专管员A处理"),
     CHECK_DETAIL_1(121, "等待专管员B处理"),
     CHECK_DETAIL_2(122, "等待核查员A处理"),
-    CHECK_DETAIL_3(123, "等待核查员B处理"),
 
     //以下为检查stat状态
     CHECK_EXAM_STAT_0(130, "检查统计数据收集中"),
     CHECK_EXAM_STAT_1(131, "检查统计数据等待确认"),
 
     //以下为检查detail状态
-    CHECK_EXAM_DETAIL_0(140, "等待专管员A处理"),
-    CHECK_EXAM_DETAIL_1(141, "等待专管员B处理"),
+    CHECK_DETAIL_REGION_0(140, "等待区专管员A处理"),
+    CHECK_DETAIL_REGION_1(141, "等待区专管员B处理"),
+    CHECK_DETAIL_REGION_2(142, "等待市专管员审核"),
+
+    // 市本级自查detail状态
+    CHECK_DETAIL_CITY_0(160, "等待专管员A处理"),
+    CHECK_DETAIL_CITY_1(161, "等待专管员B处理"),
 
     /**
      * 清退任务

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -1244,7 +1244,7 @@ public class TaskServiceImpl implements TaskService {
         if (taskSelectVo.getSelectNum() == 3) {
             //所有涉及人员所在单位包含当前用户所在单位且指针对应UserId不是当前用户
 //            List<Integer> status = Arrays.asList(201,333,810,322,722,788,1250,2223,8110,888,140,130,141,111,1002,150);
-            List<Integer> status = Arrays.asList(201,333,810,322,722,788,1250,2223,8110,888,140,130,141,111,1002,150,101);
+            List<Integer> status = Arrays.asList(201,333,810,322,722,788,1250,2223,8110,888,140,130,141,111,1002,150,101,142,160,161);
             List<TaskBto> taskBtoList = taskBtos.stream()
                     .filter(taskBto -> {
 //                        boolean unitExists = getUnitsByUsers(taskBto.getInvolveUserIdList()).contains(unitId);

docs/common_settings.md

+## 任务Task的设定
+**关于Involve_Users的设定**
+- 0 是所有都能看见
+- {id} 是该id的User可以看见
+- -1 表明该任务不是待办，而是一个业务追踪
\ No newline at end of file

docs/confirm_check.md

@@ -27,11 +27,11 @@
 
 如上图所示，核查情况与自查任务的状态有着对应的关系
 
-| 核查情况          | 结果                                   |
+| 任务状态          | 核查情况                                   |
 | ----------------- | -------------------------------------- |
 | 等待区专管员A处理 | 无                                     |
 | 等待区专管员B处理 | 进行中                                 |
-| 等待市专管员处理  | 待审核                                 |
+| 等待市专管员处理  | 等待市审核                                 |
 | 完结              | 完成                                   |
 | 等待区专管员A处理 | 未通过(可以通过Task里的特殊标记来实现) |
 
@@ -41,9 +41,9 @@
 | 核查情况                     | 核查结果 |
 | ---------------------------- | -------- |
 | 在完成以前的状态             | 无       |
-| 完成状态                     | 待审核   |
+| 完成状态                     | 等待省审核   |
 | 完成且省审核通过                   | 无误     |
-| 完成且省审核未通过(点击回退按钮了) | 未通过   |
+| 完成且省审核未通过(点击回退按钮了) | 等待重做   |
 
 ### 市本级自查流程
 
@@ -61,7 +61,7 @@
 
 如上图所示，核查情况与自查任务的状态有着对应的关系
 
-| 核查情况          | 结果                                   |
+| 任务状态         | 结果                                   |
 | ----------------- | -------------------------------------- |
 | 等待市专管员A处理 | 无                                     |
 | 等待市专管员B处理 | 进行中                                 |
@@ -73,7 +73,7 @@
 | 核查情况                     | 核查结果 |
 | ---------------------------- | -------- |
 | 在完成以前的状态             | 无       |
-| 完成状态                     | 待审核   |
+| 完成状态                     | 等待省审核   |
 | 完成且省审核通过                   | 无误     |
 | 完成且省审核未通过(点击回退按钮了) | 未通过   |
 
@@ -126,9 +126,22 @@
 | 核查结果 | 触发条件                               |
 | -------- | -------------------------------------- |
 | 无       | 该市级下所有区的核查结果为无           |
-| 待审核   | 该市级下有任意一个区核查结果为待审核 |
+| 待省审核   | 该市级下有任意一个区核查结果为等待省审核 |
 | 未通过   | 该市级下有任意一个区的核查结果为未通过     |
 | 无误   | 该市级下所有区的核查结果都为无误     |
+| 审核中   | 其他情况下为审核中     |
+
+## 关于自查状态问题的说明
+**发起人是省**
+- 状态转换 专管员A - 专管员B - 结束
+
+**发起人是市**
+- 区自查 专管员A - 专管员B - 市审核 - 结束
+- 市本级自查 专管员A - 专管员B - 结束
+
+## 已经发起的老数据的维护
+
+