1.台账管理干扰源用户和敏感用户模板调整,解决批量导入bug

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java

@@ -17,6 +17,7 @@ public enum SupervisionResponseEnum {
      */
     SUPERVISION_COMMON_ERROR("A00550","监督管理模块异常"),
     IMPORT_SENSITIVE_USER_ERROR("A00550","导入敏感及重要用户失败"),
+    IMPORT_SENSITIVE_REPORT_ERROR("A00550","导入干扰源用户失败"),
     SUPERVISION_SERVICE_NOT_FOUND("A00550","业务实现类丢失，清查看类路径配置"),
     DATA_NOT_EXISTS("A00550","数据不存在"),
     NO_POWER("A00550","不能操作非自己创建的任务！")

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java

@@ -115,7 +115,7 @@ public class SensitiveReportExcel implements Serializable {
     @Data
     @EqualsAndHashCode(callSuper = true)
     public static class SensitiveReportExcelMsg extends SensitiveReportExcel implements Serializable {
-        @Excel(name = "错误信息描述")
+        @Excel(name = "错误信息描述", width = 30)
         private String msg;
 
     }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java

@@ -37,6 +37,8 @@ public class SensitiveUserSExcel implements Serializable {
     @Excel(name = "*变电站", width = 30)
     @NotBlank(message = "变电站不能为空")
     private String substation;
+
+
     @Excel(name = "*负荷级别", width = 30)
     @NotBlank(message = "*负荷级别不能为空")
     private String loadLevel;
@@ -151,9 +153,8 @@ public class SensitiveUserSExcel implements Serializable {
     @Data
     @EqualsAndHashCode(callSuper = true)
     public static class SensitiveUserExcelMsg extends SensitiveUserSExcel implements Serializable {
-        @Excel(name = "错误信息描述")
+        @Excel(name = "错误信息描述", width = 30)
         private String msg;
-
     }
 
 }

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

@@ -116,6 +116,9 @@ public class UserReportParam {
     private String saveOrCheckflag;
 
 
+    @ApiModelProperty(value="数据来源类型 0：正常审核流程 1：批量导入")
+    private Integer dataType;
+
     private UserReportProjectPO userReportProjectPO;
 
     private UserReportSensitivePO userReportSensitivePO;