1.过程监督-谐波普测管理代码调整

2.过程监督-干扰用户管理代码调整
3.过程监督-电能质量问题管理代码调整
4.过程监督-终端监测管理代码调整

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

@@ -36,6 +36,9 @@ public class LoadTypeUserSearchParam {
     @ApiModelProperty("是否上传实测报告(0:否 1:是)")
     private Integer aIsFileUpload;
 
+    @ApiModelProperty("是否审核(0:否 1:是)")
+    private Integer checkType=0;
+
     @ApiModelProperty("页码")
     @NotNull(message = "页码不可为空")
     @Range(min = 1,message = "页码必须大于0")

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

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -19,20 +21,25 @@ import java.util.List;
 public class RGeneralSurveyPlanAddParm {
 
     @ApiModelProperty(value="单位ID")
+    @NotBlank(message = "单位不可为空")
     private String orgNo;
 
     @ApiModelProperty(value="普测计划编号")
+    @NotBlank(message = "普测计划编号不可为空")
     private String planNo;
 
     @ApiModelProperty(value="普测计划名称")
+    @NotBlank(message = "普测计划名称不可为空")
     private String planName;
 
     @ApiModelProperty(value="计划开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @NotNull(message = "计划开始时间不可为空")
     private Date planStartTime;
 
     @ApiModelProperty(value="计划结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @NotNull(message = "计划结束时间不可为空")
     private Date planEndTime;
 
     @ApiModelProperty(value="计划负责人")

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

@@ -128,6 +128,8 @@ public class RGeneralSurveyPlanPO {
     @TableField(value = "upload_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date uploadTime;
+
+
     @TableField(value = "create_person")
     private  String createPerson;
 

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

@@ -77,6 +77,10 @@ public class RLoadTypeUserManage implements Serializable {
      * 入网报告路径
      */
     private String iFilePath;
+    /**
+     * 入网报告文件名称
+     */
+    private String iFilePathName;
     /**
      * 入网报告上传时间
      */
@@ -117,6 +121,10 @@ public class RLoadTypeUserManage implements Serializable {
      * 实测报告路径
      */
     private String aFilePath;
+    /**
+     * 实测报告文件名称
+     */
+    private String aFilePathName;
     /**
      * 实测报告上传时间
      */

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

@@ -1,6 +1,7 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -18,7 +19,8 @@ import java.time.LocalDate;
 @Data
 @TableName(value = "r_survey_cycle")
 public class RSurveyCyclePO {
-    @TableField(value = "id")
+
+    @TableId(value = "id")
     private String id;
 
     @TableField(value = "start_year")