1.技术监督功能干扰源用户代码提交

pqs-process/process-api/src/main/java/com/njcn/process/enums/ThsFlowTypeEnum.java

@@ -0,0 +1,33 @@
+package com.njcn.process.enums;
+
+import lombok.Getter;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2024/4/10
+ */
+
+@Getter
+public enum ThsFlowTypeEnum {
+
+
+    rGeneralSurvey("电站普测计划",1),
+    rLoadTypeUser("干扰源用户新建计划",2)
+
+
+
+
+    ;
+
+
+    private final String name;
+
+    private final Integer code;
+
+    ThsFlowTypeEnum(String name, Integer type) {
+        this.name = name;
+        this.code = type;
+    }
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowProcDefDto.java

@@ -53,4 +53,5 @@ public class FlowProcDefDto implements Serializable {
     private Date deploymentTime;
 
 
+
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java

@@ -100,6 +100,9 @@ public class FlowTaskDto implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
-    @ApiModelProperty("此流程对应的发起表单功能")
+    @ApiModelProperty("此流程对应的发起表单功能的id")
     private String formAssId;
+
+    @ApiModelProperty("1.普测电站 1.干扰源用户")
+    private Integer formType;
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserCheckParam.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 
 @Data
@@ -21,12 +22,14 @@ public class LoadTypeUserCheckParam {
     private String checkResult;
 
     @ApiModelProperty(value="审核人")
-    @NotBlank(message = "审核人不能为空")
     private String checkPerson;
 
     @ApiModelProperty(value="审核意见")
     @NotBlank(message = "审核意见不能为空")
     private String checkComment;
 
+    @ApiModelProperty(value="id集合")
+    private List<String> ids;
+
 
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/FlowableAss.java

@@ -39,4 +39,10 @@ public class FlowableAss{
     private String execIndex;
 
 
+    /**
+     * 技术监督功能 1.普测电站 2.干扰源用户
+     */
+    private Integer type;
+
+
 }