[核查模块] 添加退回中 以及不同意功能

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

@@ -147,6 +147,10 @@ public enum LogType {
 
     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_EXAM_ROLLBACK(422, CONFIRM_CHECK_DETAIL.id,  END.id,CHECK_EXAM_STAT_1.id, "检查任务已退回至等待确认状态"),
+
     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/entity/vo/CheckAreaStatVo.java

@@ -4,10 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import org.springframework.objenesis.ObjenesisHelper;
 
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
  * CheckAreaStatVo.
@@ -75,8 +73,20 @@ public class CheckAreaStatVo implements Cloneable {
         return this;
     }
 
+    /**
+     * 重置该地区的统计数据
+     */
+    public void reset() {
+        this.actualCount = 0;
+        this.supposeCount = 0;
+        this.comProgress = 3;
+        this.comSituation = -1;
+        this.areaStatId = 0;
+        this.areaDetailId = 0;
+    }
+
     public void start() {
-        if (this.comProgress !=2){
+        if (this.comProgress != 2) {
             this.comProgress = 1;
         }
     }
@@ -194,8 +204,7 @@ public class CheckAreaStatVo implements Cloneable {
     }
 
 
-
-    public RevAreaStat reverse(){
+    public RevAreaStat reverse() {
         return new RevAreaStat(areaName, actualCount, supposeCount, comProgress, comSituation);
     }
 }