1.解决技术监督计划部门过滤bug

2.终端模板导入
3.台账关联干扰源管理，信息修改

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

@@ -30,7 +30,7 @@ public class SupervisionDevMainReportExcel {
     /**
      * 工程预期投产日期
      */
-    @Excel(name = "*工程预期投产日期", width = 30)
+    @Excel(name = "*工程预期投产日期(yyyy-MM-dd)", width = 30)
     @NotBlank(message = "不能为空")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate expectedProductionDate;
@@ -107,7 +107,7 @@ public class SupervisionDevMainReportExcel {
     /**
      * 投运时间
      */
-    @Excel(name = "*投运时间", width = 30)
+    @Excel(name = "*投运时间(yyyy-MM-dd HH:mm:ss)", width = 30)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @NotBlank(message = "投运时间不能为空")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -116,7 +116,7 @@ public class SupervisionDevMainReportExcel {
     /**
      * 数据更新时间
      */
-    @Excel(name = "数据更新时间", width = 30)
+    @Excel(name = "数据更新时间(yyyy-MM-dd HH:mm:ss)", width = 30)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime dataUpdateTime;
@@ -177,7 +177,7 @@ public class SupervisionDevMainReportExcel {
     /**
      * 本次终端检测时间
      */
-    @Excel(name = "*本次终端检测时间", width = 30)
+    @Excel(name = "*本次终端检测时间(yyyy-MM-dd HH:mm:ss)", width = 30)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @NotBlank(message = "本次终端检测时间不能为空")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -1,5 +1,6 @@
 package com.njcn.supervision.pojo.param.user;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
 import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
@@ -142,6 +143,17 @@ public class UserReportParam {
     @ApiModelProperty(value = "历史流程实例的编号")
     private String historyInstanceId;
 
+    /**
+     * 终端id
+     */
+    @ApiModelProperty(value = "终端id")
+    private String devId;
+
+    /**
+     * 监测点id
+     */
+    @ApiModelProperty(value = "监测点id")
+    private String lineId;
 
     @Data
     @EqualsAndHashCode(callSuper = true)
@@ -165,6 +177,8 @@ public class UserReportParam {
         @ApiModelProperty(value = "工程名称")
         private String projectName;
 
+        @ApiModelProperty(value = "填报部门")
+        private String orgId;
 
         @ApiModelProperty(value = "数据来源类型 0：正常审核流程 1：批量导入")
         private Integer dataType;

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/file/FileUrl.java

@@ -0,0 +1,45 @@
+package com.njcn.supervision.pojo.po.file;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 用户档案信息表	
+ * </p>
+ *
+ * @author wr
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("supervision_file_url")
+public class FileUrl extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id(对应表数据id一样)
+     */
+    private String id;
+
+    /**
+     * 字段名称
+     */
+    private String name;
+
+    /**
+     * 文件地址
+     */
+    private String url;
+
+    /**
+     * 状态：0-删除 1-正常
+     */
+    private Integer state;
+
+
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java

@@ -124,6 +124,17 @@ public class UserReportPO extends BaseEntity {
     @TableField(value = "data_type")
     private Integer dataType;
 
+    /**
+     * 终端id
+     */
+    @TableField(value = "dev_id")
+    private String devId;
+
+    /**
+     * 监测点id
+     */
+    @TableField(value = "line_id")
+    private String lineId;
 
     /**
      * 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java

@@ -165,6 +165,17 @@ public class UserReportVO {
     @ApiModelProperty(value = "true可以点击治理  false不可以点击治理 ")
     private Boolean type;
 
+    /**
+     * 终端id
+     */
+    @ApiModelProperty(value = "终端id")
+    private String devId;
+
+    /**
+     * 监测点id
+     */
+    @ApiModelProperty(value = "监测点id")
+    private String lineId;
 
     @Data
     @EqualsAndHashCode(callSuper = true)