冀北试运行接口调整

修改技术监督其他bug

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java

@@ -89,6 +89,7 @@ public class QuitRunningDeviceParam  implements Serializable {
     private Integer devOriginalStatus;
 
 
+
     @Data
     @EqualsAndHashCode(callSuper = true)
     public static class QuitRunningDeviceUpdateParam extends QuitRunningDeviceParam {

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/11  14:07【需求编号】
  *
@@ -237,5 +237,8 @@ public class SupervisionTempDeviceReportParam {
 
     private String frontType;
 
+    @ApiModelProperty(value = "审核状态")
+    private Integer status;
 
-}
+
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java

@@ -22,7 +22,7 @@ import java.util.Map;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class SupervisionTempLineDebugParam extends BaseEntity {
+public class SupervisionTempLineDebugParam {
     private String id;
 
     /**

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java

@@ -243,6 +243,9 @@ public class SupervisionTempLineReportParam {
     @ApiModelProperty(value = "流程实例的编号")
     private String historyInstanceId;
 
+    @ApiModelProperty(value = "审核状态")
+    private Integer status;
+
 
     @ApiModelProperty("发起人自选审批人 Map")
     private Map<String, List<String>> startUserSelectAssignees;

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineRunTestParam.java

@@ -79,6 +79,12 @@ public class SupervisionTempLineRunTestParam {
     private String endTime;
 
 
+    /**
+     * 用于标识第几次发起
+     */
+    private Integer operateType;
+
+
     @Data
     @EqualsAndHashCode(callSuper = true)
     public static class SupervisionTempLineRunTestUpdateParam extends SupervisionTempLineRunTestParam {

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/plan/SupervisionPlanParam.java

@@ -150,6 +150,10 @@ public class SupervisionPlanParam extends BaseParam {
     @ApiModelProperty(value = "计划状态")
     private String planStatus;
 
+
+    @ApiModelProperty(value = "审核状态")
+    private Integer status;
+
     @EqualsAndHashCode(callSuper = true)
     @Data
     public static class UpdateSupvPlanParam extends SupervisionPlanParam{

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java

@@ -56,6 +56,9 @@ public class SupervisionUserComplaintParam {
     @ApiModelProperty(value = "状态：0-删除 1-正常")
     private Integer state;
 
+    @ApiModelProperty(value = "审核状态")
+    private Integer status;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SupervisionGeneralSurveyPlanParm.java

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/13  18:35【需求编号】
  *
@@ -22,6 +22,7 @@ import java.util.Map;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@Deprecated
 public class SupervisionGeneralSurveyPlanParm  {
 
 
@@ -124,4 +125,4 @@ public class SupervisionGeneralSurveyPlanParm  {
         private String orgNo;
 
     }
-}
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java

@@ -19,7 +19,7 @@ import java.time.LocalDate;
  * @since 2024-05-30
  */
 @Data
-public class SurveyTestParam extends BaseEntity implements Serializable {
+public class SurveyTestParam implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java

@@ -27,7 +27,7 @@ import java.util.Map;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class UserReportParam extends BaseEntity {
+public class UserReportParam {
 
 
     /**
@@ -134,6 +134,8 @@ public class UserReportParam extends BaseEntity {
 
 
 
+
+
     @Data
     @EqualsAndHashCode(callSuper = true)
     public  static class UserReportUpdate extends UserReportParam {
@@ -160,6 +162,9 @@ public class UserReportParam extends BaseEntity {
         @ApiModelProperty(value="数据来源类型 0：正常审核流程 1：批量导入")
         private Integer dataType;
 
+        @ApiModelProperty(value = "审核状态")
+        private Integer status;
+
     }