干扰源功能

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

@@ -23,7 +23,6 @@ public class LoadTypeUserAUploadParam {
     private String id;
 
     @ApiModelProperty(name = "file",value = "实测报告文件",required = true)
-    @NotNull(message = "实测报告文件不可为空")
     private MultipartFile file;
 
     @ApiModelProperty(name = "status",value = "数据状态（1：提交 2：保存）",required = true)

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

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * 未建档干扰源用户关联营销Param
@@ -28,7 +27,11 @@ public class LoadTypeUserAssociateParam {
     private String userLoadType;
 
     @ApiModelProperty("关联干扰源用户编号")
-    @NotNull(message = "关联干扰源用户编号不可为空")
+    @NotBlank(message = "关联干扰源用户编号不可为空")
     private String relationUserId;
 
+    @ApiModelProperty("关联干扰源用户名称")
+    @NotBlank(message = "关联干扰源用户名称不可为空")
+    private String relationUserName;
+
 }

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

@@ -23,7 +23,6 @@ public class LoadTypeUserIUploadParam {
     private String id;
 
     @ApiModelProperty(name = "file",value = "入网报告文件",required = true)
-    @NotNull(message = "入网报告文件不可为空")
     private MultipartFile file;
 
     @ApiModelProperty(name = "status",value = "数据状态（1：提交 2：保存）",required = true)

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

@@ -30,7 +30,10 @@ public class LoadTypeUserSearchParam {
     @ApiModelProperty("关联干扰源用户名称")
     private String relationUserName;
 
-    @ApiModelProperty("是否上传报告(0:否 1:是)")
+    @ApiModelProperty("是否上传入网报告(0:否 1:是)")
+    private Integer iIsFileUpload;
+
+    @ApiModelProperty("是否上传实测报告(0:否 1:是)")
     private Integer aIsFileUpload;
 
     @ApiModelProperty("页码")

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

@@ -56,6 +56,10 @@ public class RLoadTypeUserManage implements Serializable {
      * 用户类型，字典表
      */
     private String userLoadType;
+    /**
+     * 入网报告是否上传(0:否 1:是)
+     */
+    private Integer iIsFileUpload;
     /**
      * 入网报告状态，字典ID
      */

process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeRelationExcel.java

@@ -0,0 +1,32 @@
+package com.njcn.process.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/12/07 9:21
+ */
+@Data
+public class LoadTypeRelationExcel implements Serializable {
+
+    @Excel(name = "单位名称", width = 15)
+    private String orgName;
+
+    @Excel(name = "干扰源类型", width = 15)
+    private String loadTypeName;
+
+    @Excel(name = "干扰源用户名称", width = 15)
+    private String userName;
+
+    @Excel(name = "关联干扰源用户名称", width = 15)
+    private String relationUserName;
+
+    @Excel(name = "实测报告状态", width = 15)
+    private String aStatusName;
+
+
+}

process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeUserExcel.java

@@ -0,0 +1,38 @@
+package com.njcn.process.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/12/06 9:21
+ */
+@Data
+public class LoadTypeUserExcel implements Serializable {
+
+    @Excel(name = "单位名称", width = 15)
+    private String orgName;
+
+    @Excel(name = "干扰源类型", width = 15)
+    private String loadTypeName;
+
+    @Excel(name = "干扰源用户名称", width = 15)
+    private String userName;
+
+    @Excel(name = "建档时间", format = "yyyy-MM-dd HH:mm:ss", width = 15)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date recordTime;
+
+    @Excel(name = "报告是否上传", width = 15)
+    private String iIsFileUpload;
+
+    @Excel(name = "入网报告状态", width = 15)
+    private String iStatusName;
+
+
+}

process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java

@@ -1,5 +1,6 @@
 package com.njcn.process.pojo.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,103 +18,142 @@ public class RLoadTypeUserManageVO implements Serializable {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     private String id;
     /**
      * 单位ID
      */
+    @ApiModelProperty("单位ID")
     private String orgNo;
     /**
      * 干扰源类型ID
      */
+    @ApiModelProperty("干扰源类型ID")
     private String loadType;
     /**
      * 干扰源用户名称
      */
+    @ApiModelProperty("干扰源用户名称")
     private String userName;
     /**
      * 关联干扰源用户编号ID
      */
+    @ApiModelProperty("关联干扰源用户编号ID")
     private String relationUserId;
     /**
      * 关联干扰源用户名称
      */
+    @ApiModelProperty("关联干扰源用户名称")
     private String relationUserName;
     /**
      * 建档时间
      */
+    @ApiModelProperty("建档时间")
     private Date recordTime;
     /**
      * 送电日期（并网日期）
      */
+    @ApiModelProperty("送电日期（并网日期）")
     private Date powerTransmissionDate;
     /**
      * 合同容量（总装机容量）
      */
+    @ApiModelProperty("合同容量（总装机容量）")
     private Float userArgeementCapacity;
     /**
      * 用户类型，字典表
      */
+    @ApiModelProperty("用户类型，字典表")
     private String userLoadType;
+    /**
+     * 入网报告是否上传(0:否 1:是)
+     */
+    @ApiModelProperty("入网报告是否上传(0:否 1:是)")
+    private Integer iIsFileUpload;
     /**
      * 入网报告状态，字典ID
      */
+    @ApiModelProperty("入网报告状态，字典ID")
     private String iStatus;
     /**
      * 入网报告路径
      */
+    @ApiModelProperty("入网报告路径")
     private String iFilePath;
     /**
      * 入网报告上传时间
      */
+    @ApiModelProperty("入网报告上传时间")
     private Date iUploadTime;
     /**
      * 入网是否超标(0:否 1:是)
      */
+    @ApiModelProperty("入网是否超标(0:否 1:是)")
     private Integer iIsOverLimit;
     /**
      * 入网超标指标
      */
+    @ApiModelProperty("入网超标指标")
     private String iOverLimitTarget;
     /**
      * 入网计划采取措施，字典ID
      */
+    @ApiModelProperty("入网计划采取措施，字典ID")
     private String iPlanStep;
     /**
      * 入网详情
      */
+    @ApiModelProperty("入网详情")
     private String iDescription;
     /**
      * 实测报告是否上传(0:否 1:是)
      */
+    @ApiModelProperty("实测报告是否上传(0:否 1:是)")
     private Integer aIsFileUpload;
     /**
      * 实测报告状态，字典ID
      */
+    @ApiModelProperty("实测报告状态，字典ID")
     private String aStatus;
     /**
      * 实测报告路径
      */
+    @ApiModelProperty("实测报告路径")
     private String aFilePath;
     /**
      * 实测报告上传时间
      */
+    @ApiModelProperty("实测报告上传时间")
     private Date aUploadTime;
     /**
      * 实测是否超标(0:否 1:是)
      */
+    @ApiModelProperty("实测是否超标(0:否 1:是)")
     private Integer aIsOverLimit;
     /**
      * 实测超标指标
      */
+    @ApiModelProperty("实测超标指标")
     private String aOverLimitTarget;
     /**
      * 实测计划采取措施，字典ID
      */
+    @ApiModelProperty("实测计划采取措施，字典ID")
     private String aPlanStep;
     /**
      * 实测详情
      */
+    @ApiModelProperty("实测详情")
     private String aDescription;
 
+    @ApiModelProperty("单位名称")
+    private String orgName;
+
+    @ApiModelProperty("入网报告文件地址")
+    private String iFile;
+
+    @ApiModelProperty("实测报告文件地址")
+    private String aFile;
+
 }