1.技术监督历史计划

2.技术监督预告警单和反馈数据
3.技术监督国网上送，计划历史记录、告警单和反馈数据
4.技术监督bug修改

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

@@ -0,0 +1,74 @@
+package com.njcn.process.pojo.param;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @author wr
+ * @description
+ * @date 2023/9/1 14:32
+ */
+@Data
+public class SupvAlarmBackParam extends BaseParam {
+
+    @ApiModelProperty(value = "监督单位",required = true)
+    private String orgId;
+
+    @ApiModelProperty(value = "告预警单编号",required = true)
+    private String workAlarmId;
+
+    @Data
+    public  static class AlarmBackInsert {
+        @ApiModelProperty("项目执行单位编号")
+        private String executeOrgId;
+
+        @ApiModelProperty("项目执行单位名称")
+        private String executeOrgName;
+
+        @ApiModelProperty("采取措施")
+        @NotBlank(message = "采取措施不能为空")
+        private String treatmentMeasures;
+
+        @ApiModelProperty("填报人id,取ISC平台上的人员id")
+        @NotBlank(message = "采取措施不能为空")
+        private String fillUserId;
+
+        @ApiModelProperty("填报人名称,取ISC平台上的人员名称")
+        @NotBlank(message = "填报人名称不能为空")
+        private String fillUserName;
+
+        @ApiModelProperty("完成时间	yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @NotNull(message = "完成时间不能为空")
+        private LocalDateTime completeTime;
+
+        @ApiModelProperty("告预警单id,关联告预警单表")
+        @NotBlank(message = "告预警单编号不能为空")
+        private String workAlarmId;
+
+        @ApiModelProperty("反馈单位id,取ISC平台上的组织id")
+        private String feedbackOrgId;
+
+        @ApiModelProperty("反馈单位名称,取ISC平台上的组织名称")
+        private String feedbackOrgName;
+
+    }
+
+    @Data
+    public  static class AlarmBackUpdate extends AlarmBackInsert {
+
+        @ApiModelProperty("预告警单反馈编号")
+        @NotBlank(message = "预告警单反馈编号不能为空")
+        private String alarmBackId;
+
+    }
+}

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

@@ -0,0 +1,112 @@
+package com.njcn.process.pojo.param;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @author wr
+ * @description
+ * @date 2023/9/1 14:32
+ */
+@Data
+public class SupvAlarmParam extends BaseParam {
+
+    @ApiModelProperty(value = "监督单位",required = true)
+    private String orgId;
+
+    @Data
+    public static class AlarmInsert {
+
+        @ApiModelProperty("单据类别")
+        @NotBlank(message = "单据类别不能为空")
+        private String billType;
+
+        @ApiModelProperty("单据编号")
+        @NotBlank(message = "单据编号不能为空")
+        private String billNo;
+
+        @ApiModelProperty("单据名称")
+        @NotBlank(message = "单据名称不能为空")
+        private String billName;
+
+        @ApiModelProperty("编制单位id,取ISC平台上的组织id （sys_dept）")
+        @NotBlank(message = "编制单位编号不能为空")
+        private String createrOrgId;
+
+        @ApiModelProperty("编制单位名称,取ISC平台上的组织名称")
+        @NotBlank(message = "编制单位名称不能为空")
+        private String createrOrgName;
+
+        @ApiModelProperty("所属专业,见3.11（字典）")
+        @NotBlank(message = "所属专业不能为空")
+        private String specialityType;
+
+        @ApiModelProperty("责任单位id,取ISC平台上的组织id")
+        @NotBlank(message = "责任单位编号不能为空")
+        private String orgId;
+
+        @ApiModelProperty("责任单位名称,取ISC平台上的组织名称")
+        @NotBlank(message = "责任单位名称不能为空")
+        private String orgName;
+
+        @ApiModelProperty("接收人id,取ISC平台上的人员id")
+        private String receiveUserId;
+
+        @ApiModelProperty("接收人名称,取ISC平台上的人员名称")
+        private String receiveUserName;
+
+        @ApiModelProperty("编制时间	yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @NotNull(message = "完成时间不能为空")
+        private LocalDateTime createrTime;
+
+        @ApiModelProperty("主管部门id,取ISC平台上的组织id")
+        @NotBlank(message = "主管部门编号不能为空")
+        private String managerDeptId;
+
+        @ApiModelProperty("主管部门名称,取ISC平台上的组织名称")
+        @NotBlank(message = "主管部门名称不能为空")
+        private String managerDeptName;
+
+        @ApiModelProperty("主送单位id,取ISC平台上的组织id")
+        private String mainSenderId;
+
+        @ApiModelProperty("主送单位名称,取ISC平台上的组织名称")
+        private String mainSenderName;
+
+        @ApiModelProperty("抄送单位id,取ISC平台上的组织id")
+        private String copySenderId;
+
+        @ApiModelProperty("抄送单位名称,取ISC平台上的组织名称")
+        private String copySenderName;
+
+        @ApiModelProperty("依据标准")
+        @NotBlank(message = "依据标准不能为空")
+        private String techSupvBasis;
+
+        @ApiModelProperty("问题描述")
+        @NotBlank(message = "问题描述不能为空")
+        private String problemDesc;
+
+        @ApiModelProperty("处理建议")
+        @NotBlank(message = "处理建议不能为空")
+        private String dealAdvise;
+
+
+    }
+
+    @Data
+    public  static class AlarmUpdate extends AlarmInsert {
+
+        @ApiModelProperty("预告警单id")
+        private String alarmId;
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.njcn.process.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @author wr
+ * @description
+ * @date 2023/9/1 14:32
+ */
+@Data
+public class SupvPlanHisParam extends BaseParam {
+
+    @ApiModelProperty(value = "监督单位",required = true)
+    private String orgId;
+
+    @Data
+    public  static class insert {
+
+        @ApiModelProperty("计划表主键")
+        @NotBlank(message = "计划表编号不能为空")
+        private String planId;
+
+        @ApiModelProperty("其他要求")
+        @NotBlank(message = "其他要求不能为空")
+        private String otherRemark;
+
+        @ApiModelProperty("调整原因")
+        @NotBlank(message = "调整原因不能为空")
+        private String applyComment;
+
+    }
+
+    @Data
+    public  static class update extends insert{
+
+        @ApiModelProperty("历史记录编号")
+        private String id;
+
+        @ApiModelProperty("计划名称")
+        @NotBlank(message = "计划表名称不能为空")
+        private String workPlanName;
+
+        @ApiModelProperty("监督单位id 取ISC平台上的组织id")
+        private String supvOrgId;
+
+        private String supvOrgName;
+
+        @ApiModelProperty("计划监督时间")
+        private LocalDate planSupvDate;
+
+        @ApiModelProperty("计划状态")
+        private String planStatus;
+
+        @ApiModelProperty("更新人id")
+        private String updateUserId;
+
+        private String updateUserName;
+
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        private LocalDateTime updateTime;
+
+        @ApiModelProperty("取消标识")
+        private String deleteFlag;
+
+        @ApiModelProperty("当取消标识为1时必填")
+        private LocalDate deleteTime;
+
+        @ApiModelProperty("上次变更记录主键,	从第二次变更起为必填")
+        private String parentId;
+
+        @ApiModelProperty("调整时间,	审核通过时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        private LocalDateTime adjustTime;
+
+
+    }
+}

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

@@ -152,6 +152,8 @@ public class SupvPlanParam extends BaseParam {
     @ApiModelProperty(value = "实施人")
     private String effectUserId;
 
+    @ApiModelProperty(value = "计划状态")
+    private String planStatus;
 
     @EqualsAndHashCode(callSuper = true)
     @Data
@@ -160,6 +162,12 @@ public class SupvPlanParam extends BaseParam {
         @ApiModelProperty(value = "索引",required = true)
         @NotBlank(message = "计划索引不可为空")
         private String planId;
+
+        @ApiModelProperty("其他要求")
+        private String otherRemarkHis;
+
+        @ApiModelProperty("调整原因")
+        private String applyCommentHis;
     }
 
 }

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

@@ -0,0 +1,125 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wr
+ * @since 2023-09-01
+ */
+@Data
+@TableName("supv_alarm")
+@ApiModel(value = "SupvAlarm对象", description = "")
+public class SupvAlarm {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("Alarm_Id")
+    private String alarmId;
+
+    @ApiModelProperty("省id")
+    @TableField("Province_Id")
+    private String provinceId;
+
+    @ApiModelProperty("省名称")
+    @TableField("province_Name")
+    private String provinceName;
+
+    @ApiModelProperty("单据类别")
+    @TableField("bill_Type")
+    private String billType;
+
+    @ApiModelProperty("单据编号")
+    @TableField("bill_No")
+    private String billNo;
+
+    @ApiModelProperty("单据名称")
+    @TableField("bill_Name")
+    private String billName;
+
+    @ApiModelProperty("编制单位id,取ISC平台上的组织id （sys_dept）")
+    @TableField("creater_Org_Id")
+    private String createrOrgId;
+
+    @ApiModelProperty("编制单位名称,取ISC平台上的组织名称")
+    @TableField("creater_Org_Name")
+    private String createrOrgName;
+
+    @ApiModelProperty("所属专业,见3.11（字典）")
+    @TableField("speciality_Type")
+    private String specialityType;
+
+    @ApiModelProperty("责任单位id,取ISC平台上的组织id")
+    @TableField("org_Id")
+    private String orgId;
+
+    @ApiModelProperty("责任单位名称,取ISC平台上的组织名称")
+    @TableField("org_Name")
+    private String orgName;
+
+    @ApiModelProperty("接收人id,取ISC平台上的人员id")
+    @TableField("receive_UserId")
+
+    private String receiveUserId;
+
+    @ApiModelProperty("接收人名称,取ISC平台上的人员名称")
+    @TableField("receive_User_Name")
+    private String receiveUserName;
+
+    @ApiModelProperty("编制时间	yyyy-MM-dd HH:mm:ss")
+    @TableField("creater_Time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime createrTime;
+
+    @ApiModelProperty("主管部门id,取ISC平台上的组织id")
+    @TableField("manager_Dept_Id")
+    private String managerDeptId;
+
+    @ApiModelProperty("主管部门名称,取ISC平台上的组织名称")
+    @TableField("manager_Dept_Name")
+    private String managerDeptName;
+
+    @ApiModelProperty("主送单位id,取ISC平台上的组织id")
+    @TableField("main_Sender_Id")
+    private String mainSenderId;
+
+    @ApiModelProperty("主送单位名称,取ISC平台上的组织名称")
+    @TableField("main_Sender_Name")
+    private String mainSenderName;
+
+    @ApiModelProperty("抄送单位id,取ISC平台上的组织id")
+    @TableField("copy_Sender_Id")
+    private String copySenderId;
+
+    @ApiModelProperty("抄送单位名称,取ISC平台上的组织名称")
+    @TableField("copy_Sender_Name")
+    private String copySenderName;
+
+    @ApiModelProperty("依据标准")
+    @TableField("tech_Supv_Basis")
+    private String techSupvBasis;
+
+    @ApiModelProperty("问题描述")
+    @TableField("problem_Desc")
+    private String problemDesc;
+
+    @ApiModelProperty("处理建议")
+    @TableField("deal_Advise")
+    private String dealAdvise;
+
+    @ApiModelProperty("0.以上送 1.未上送 2.取消上送 3.待重新上送")
+    @TableField("is_upload_head")
+    private Integer isUploadHead;
+
+}

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

@@ -0,0 +1,85 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 技术监督预告警单反馈数据表
+ * </p>
+ *
+ * @author wr
+ * @since 2023-09-01
+ */
+@Data
+@TableName("supv_alarm_back")
+@ApiModel(value = "SupvAlarmBack对象", description = "技术监督预告警单反馈数据表")
+public class SupvAlarmBack {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("alarm_Back_Id")
+    private String alarmBackId;
+
+    @TableField("execute_Org_Id")
+    private String executeOrgId;
+
+    @TableField("execute_Org_Name")
+    private String executeOrgName;
+
+    @TableField("treatment_Measures")
+    private String treatmentMeasures;
+
+    @ApiModelProperty("填报人id,取ISC平台上的人员id")
+    @TableField("fill_User_Id")
+    private String fillUserId;
+
+    @ApiModelProperty("填报人名称,取ISC平台上的人员名称")
+    @TableField("fill_User_Name")
+    private String fillUserName;
+
+    @ApiModelProperty("完成时间	yyyy-MM-dd HH:mm:ss")
+    @TableField("complete_Time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime completeTime;
+
+    @ApiModelProperty("告预警单id,关联告预警单表")
+    @TableField("work_Alarm_Id")
+    private String workAlarmId;
+
+    @ApiModelProperty("单据编号")
+    @TableField(exist = false)
+    private String billNo;
+
+    @ApiModelProperty("单据名称")
+    @TableField(exist = false)
+    private String billName;
+
+
+    @ApiModelProperty("反馈单位id,取ISC平台上的组织id")
+    @TableField("feedback_Org_Id")
+    private String feedbackOrgId;
+
+    @ApiModelProperty("反馈单位名称,取ISC平台上的组织名称")
+    @TableField("feedback_Org_Name")
+    private String feedbackOrgName;
+
+    @TableField("province_Id")
+    private String provinceId;
+
+    @ApiModelProperty("省名称,取ISC平台上的组织名称")
+    @TableField("province_Name")
+    private String provinceName;
+
+    @ApiModelProperty("0.以上送 1.未上送 2.取消上送 3.待重新上送")
+    @TableField("is_upload_head")
+    private Integer isUploadHead;
+
+
+}

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

@@ -4,14 +4,10 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 
-import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>
@@ -205,7 +201,7 @@ public class SupvPlan extends BaseEntity {
     /**
      * 删除标识	0否1是
      */
-    private String deleteFlag="0";
+    private String deleteFlag = "0";
     /**
      * 计划状态	1新建2变更 3取消
      */

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

@@ -0,0 +1,95 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 监督工作计划变更历史数据表
+ * </p>
+ *
+ * @author wr
+ * @since 2023-09-01
+ */
+@Data
+@TableName("supv_plan_his")
+@ApiModel(value = "SupvPlanHis对象", description = "监督工作计划变更历史数据表")
+public class SupvPlanHis {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("Id")
+    private String id;
+
+    @ApiModelProperty("计划表主键")
+    @TableField("Plan_Id")
+    private String planId;
+
+    @ApiModelProperty("计划名称")
+    @TableField("Work_Plan_Name")
+    private String workPlanName;
+
+    @ApiModelProperty("监督单位id 取ISC平台上的组织id")
+    @TableField("Supv_Org_Id")
+    private String supvOrgId;
+
+    @TableField("Supv_Org_Name")
+    private String supvOrgName;
+
+    @ApiModelProperty("计划监督时间")
+    @TableField("plan_Supv_Date")
+    private LocalDate planSupvDate;
+
+    @ApiModelProperty("其他要求")
+    @TableField("Other_Remark")
+    private String otherRemark;
+
+    @ApiModelProperty("调整原因")
+    @TableField("Apply_Comment")
+    private String applyComment;
+
+    @ApiModelProperty("计划状态")
+    @TableField("Plan_Status")
+    private String planStatus;
+
+    @ApiModelProperty("更新人id")
+    @TableField("Update_User_Id")
+    private String updateUserId;
+
+    @TableField("Update_User_Name")
+    private String updateUserName;
+
+    @TableField("Update_Time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("取消标识")
+    @TableField("Delete_Flag")
+    private String deleteFlag;
+
+    @ApiModelProperty("当取消标识为1时必填")
+    @TableField("Delete_Time")
+    private LocalDate deleteTime;
+
+    @ApiModelProperty("上次变更记录主键,	从第二次变更起为必填")
+    @TableField("Parent_Id")
+    private String parentId;
+
+    @ApiModelProperty("调整时间,	审核通过时间")
+    @TableField("Adjust_Time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime adjustTime;
+
+    @ApiModelProperty("0.以上送 1.未上送 2.取消上送 3.待重新上送")
+    @TableField("is_upload_head")
+    private Integer isUploadHead;
+
+
+}

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

@@ -6,18 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDate;
+
 import java.time.LocalDateTime;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotBlank;
 
 /**
  * <p>
@@ -27,8 +21,8 @@ import javax.validation.constraints.NotBlank;
  * @author hongawen
  * @since 2023-06-21
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("supv_problem")
 public class SupvProblem extends BaseEntity {
 
@@ -148,18 +142,18 @@ public class SupvProblem extends BaseEntity {
     private String remark;
 
     @TableField(exist = false)
-    @ApiModelProperty(name = "attachmentName",value = "盖章报告")
+    @ApiModelProperty(name = "attachmentName", value = "盖章报告")
     private String attachmentName;
 
 
     @TableField(exist = false)
-    @ApiModelProperty(name = "attachmentNameTwo",value = "佐证材料")
+    @ApiModelProperty(name = "attachmentNameTwo", value = "佐证材料")
     private String attachmentNameTwo;
 
     /**
      * 问题发现时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime  discoveryTime;
+    private LocalDateTime discoveryTime;
 
 }

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

@@ -181,5 +181,6 @@ public class SupvPlanVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-
+    @ApiModelProperty(value = "计划状态")
+    private String planStatus;
 }

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

@@ -0,0 +1,153 @@
+package com.njcn.process.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.process.pojo.po.SupvProblem;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-06-21
+ */
+@Data
+public class SupvProblemVO  {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @Excel(name = "",width = 15)
+    private String problemId;
+
+    @Excel(name = "",width = 15)
+    private String workPlanName;
+
+    @Excel(name = "",width = 15)
+    private String provinceId;
+
+    @Excel(name = "",width = 15)
+    private String planId;
+
+    @Excel(name = "",width = 15)
+    private String dutyOrgId;
+
+    @Excel(name = "",width = 15)
+    private String dutyOrgName;
+
+    @Excel(name = "",width = 15)
+    private String monitorType;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @Excel(name = "",width = 15)
+    private LocalDateTime rectificationTime;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "",width = 15)
+    private LocalDateTime planRectificationTime;
+
+    /**
+     * 是否发布预告警
+     */
+    @Excel(name = "",width = 15)
+    private Integer ifReleaseWarning;
+
+    /**
+     * 问题简要描述
+     */
+    @Excel(name = "",width = 15)
+    private String simpleProblemDesc;
+
+    /**
+     * 监督标准序号
+     */
+    @Excel(name = "",width = 15)
+    private String supvStandardSort;
+
+    /**
+     * 问题描述
+     */
+    @Excel(name = "",width = 15)
+    private String problemDesc;
+
+    /**
+     * 监督标准
+     */
+    private String supvStandard;
+
+    /**
+     * 标准出处
+     */
+    private String supvResouce;
+
+    /**
+     * 问题等级	01 一般，02 较大
+     */
+    private String problemLevel;
+
+    /**
+     * 定级依据
+     */
+    private String problemLevelReason;
+
+    /**
+     * 问题类型
+     */
+    private String problemType;
+
+    /**
+     * 整改方案
+     */
+    private String rectificationProgramme;
+
+    /**
+     * 整改情况01已整改，02未整改
+     */
+    private String rectificationStatus;
+
+
+    /**
+     * 整改措施
+     */
+    private String rectificationMeasure;
+
+
+    /**
+     * 0.以上送 1.未上送 2.取消上送
+     */
+    private Integer isUploadHead;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "attachmentName", value = "盖章报告")
+    private String attachmentName;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "attachmentNameTwo", value = "佐证材料")
+    private String attachmentNameTwo;
+
+    /**
+     * 问题发现时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime discoveryTime;
+
+
+
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/gw/AlarmBackVO.java

@@ -0,0 +1,188 @@
+package com.njcn.process.pojo.vo.gw;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 技术监督预告警单反馈数据表
+ * </p>
+ *
+ * @author wr
+ * @since 2023-09-01
+ */
+@Getter
+public class AlarmBackVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("alarm_Back_Id")
+    private String alarmBackId;
+
+    @TableField("execute_Org_Id")
+    private String executeOrgId;
+
+    @TableField("execute_Org_Name")
+    private String executeOrgName;
+
+    @TableField("treatment_Measures")
+    private String treatmentMeasures;
+
+    @ApiModelProperty("填报人id,取ISC平台上的人员id")
+    @TableField("fill_User_Id")
+    private String fillUserId;
+
+    @ApiModelProperty("填报人名称,取ISC平台上的人员名称")
+    @TableField("fill_User_Name")
+    private String fillUserName;
+
+    @ApiModelProperty("完成时间	yyyy-MM-dd HH:mm:ss")
+    @TableField("complete_Time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime completeTime;
+
+    @ApiModelProperty("告预警单id,关联告预警单表")
+    @TableField("work_Alarm_Id")
+    private String workAlarmId;
+
+    @ApiModelProperty("单据编号")
+    @TableField(exist = false)
+    private String billNo;
+
+    @ApiModelProperty("单据名称")
+    @TableField(exist = false)
+    private String billName;
+
+
+    @ApiModelProperty("反馈单位id,取ISC平台上的组织id")
+    @TableField("feedback_Org_Id")
+    private String feedbackOrgId;
+
+    @ApiModelProperty("反馈单位名称,取ISC平台上的组织名称")
+    @TableField("feedback_Org_Name")
+    private String feedbackOrgName;
+
+    @TableField("province_Id")
+    private String provinceId;
+
+    @ApiModelProperty("省名称,取ISC平台上的组织名称")
+    @TableField("province_Name")
+    private String provinceName;
+
+    @ApiModelProperty("0.以上送 1.未上送 2.取消上送 3.待重新上送")
+    @TableField("is_upload_head")
+    private Integer isUploadHead;
+
+    public void setAlarmBackId(String alarmBackId) {
+        if (StrUtil.isNotBlank(alarmBackId)) {
+            this.alarmBackId = alarmBackId;
+        } else {
+            this.alarmBackId = null;
+        }
+    }
+
+    public void setExecuteOrgId(String executeOrgId) {
+        if (StrUtil.isNotBlank(executeOrgId)) {
+            this.executeOrgId = executeOrgId;
+        } else {
+            this.executeOrgId = null;
+        }
+    }
+
+    public void setExecuteOrgName(String executeOrgName) {
+        if (StrUtil.isNotBlank(executeOrgName)) {
+            this.executeOrgName = executeOrgName;
+        } else {
+            this.executeOrgName = null;
+        }
+    }
+
+    public void setTreatmentMeasures(String treatmentMeasures) {
+        if (StrUtil.isNotBlank(treatmentMeasures)) {
+            this.treatmentMeasures = treatmentMeasures;
+        } else {
+            this.treatmentMeasures = null;
+        }
+    }
+
+    public void setFillUserId(String fillUserId) {
+        if (StrUtil.isNotBlank(fillUserId)) {
+            this.fillUserId = fillUserId;
+        } else {
+            this.fillUserId = null;
+        }
+    }
+
+    public void setFillUserName(String fillUserName) {
+        if (StrUtil.isNotBlank(fillUserName)) {
+            this.fillUserName = fillUserName;
+        } else {
+            this.fillUserName = null;
+        }
+    }
+
+    public void setCompleteTime(LocalDateTime completeTime) {
+        this.completeTime = completeTime;
+    }
+
+    public void setWorkAlarmId(String workAlarmId) {
+        if (StrUtil.isNotBlank(workAlarmId)) {
+            this.workAlarmId = workAlarmId;
+        } else {
+            this.workAlarmId = null;
+        }
+    }
+
+    public void setFeedbackOrgId(String feedbackOrgId) {
+        if (StrUtil.isNotBlank(feedbackOrgId)) {
+            this.feedbackOrgId = feedbackOrgId;
+        } else {
+            this.feedbackOrgId = null;
+        }
+    }
+
+    public void setFeedbackOrgName(String feedbackOrgName) {
+        if (StrUtil.isNotBlank(feedbackOrgName)) {
+            this.feedbackOrgName = feedbackOrgName;
+        } else {
+            this.feedbackOrgName = null;
+        }
+    }
+
+    public void setProvinceId(String provinceId) {
+        if (StrUtil.isNotBlank(provinceId)) {
+            this.provinceId = provinceId;
+        } else {
+            this.provinceId = null;
+        }
+    }
+
+    public void setProvinceName(String provinceName) {
+        if (StrUtil.isNotBlank(provinceName)) {
+            this.provinceName = provinceName;
+        } else {
+            this.provinceName = null;
+        }
+    }
+
+    public void setBillNo(String billNo) {
+        this.billNo = billNo;
+    }
+
+    public void setBillName(String billName) {
+        this.billName = billName;
+    }
+
+    public void setIsUploadHead(Integer isUploadHead) {
+        this.isUploadHead = isUploadHead;
+    }
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/gw/AlarmVO.java

@@ -0,0 +1,306 @@
+package com.njcn.process.pojo.vo.gw;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wr
+ * @since 2023-09-01
+ */
+@Getter
+public class AlarmVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("Alarm_Id")
+    private String alarmId;
+
+    @ApiModelProperty("省id")
+    @TableField("Province_Id")
+    private String provinceId;
+
+    @ApiModelProperty("省名称")
+    @TableField("province_Name")
+    private String provinceName;
+
+    @ApiModelProperty("单据类别")
+    @TableField("bill_Type")
+    private String billType;
+
+    @ApiModelProperty("单据编号")
+    @TableField("bill_No")
+    private String billNo;
+
+    @ApiModelProperty("单据名称")
+    @TableField("bill_Name")
+    private String billName;
+
+    @ApiModelProperty("编制单位id,取ISC平台上的组织id （sys_dept）")
+    @TableField("creater_Org_Id")
+    private String createrOrgId;
+
+    @ApiModelProperty("编制单位名称,取ISC平台上的组织名称")
+    @TableField("creater_Org_Name")
+    private String createrOrgName;
+
+    @ApiModelProperty("所属专业,见3.11（字典）")
+    @TableField("speciality_Type")
+    private String specialityType;
+
+    @ApiModelProperty("责任单位id,取ISC平台上的组织id")
+    @TableField("org_Id")
+    private String orgId;
+
+    @ApiModelProperty("责任单位名称,取ISC平台上的组织名称")
+    @TableField("org_Name")
+    private String orgName;
+
+    @ApiModelProperty("接收人id,取ISC平台上的人员id")
+    @TableField("receive_UserId")
+    private String receiveUserid;
+
+    @ApiModelProperty("接收人名称,取ISC平台上的人员名称")
+    @TableField("receive_User_Name")
+    private String receiveUserName;
+
+    @ApiModelProperty("编制时间	yyyy-MM-dd HH:mm:ss")
+    @TableField("creater_Time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime createrTime;
+
+    @ApiModelProperty("主管部门id,取ISC平台上的组织id")
+    @TableField("manager_Dept_Id")
+    private String managerDeptId;
+
+    @ApiModelProperty("主管部门名称,取ISC平台上的组织名称")
+    @TableField("manager_Dept_Name")
+    private String managerDeptName;
+
+    @ApiModelProperty("主送单位id,取ISC平台上的组织id")
+    @TableField("main_Sender_Id")
+    private String mainSenderId;
+
+    @ApiModelProperty("主送单位名称,取ISC平台上的组织名称")
+    @TableField("main_Sender_Name")
+    private String mainSenderName;
+
+    @ApiModelProperty("抄送单位id,取ISC平台上的组织id")
+    @TableField("copy_Sender_Id")
+    private String copySenderId;
+
+    @ApiModelProperty("抄送单位名称,取ISC平台上的组织名称")
+    @TableField("copy_Sender_Name")
+    private String copySenderName;
+
+    @ApiModelProperty("依据标准")
+    @TableField("tech_Supv_Basis")
+    private String techSupvBasis;
+
+    @ApiModelProperty("问题描述")
+    @TableField("problem_Desc")
+    private String problemDesc;
+
+    @ApiModelProperty("处理建议")
+    @TableField("deal_Advise")
+    private String dealAdvise;
+
+    @ApiModelProperty("0.以上送 1.未上送 2.取消上送 3.待重新上送")
+    @TableField("is_upload_head")
+    private Integer isUploadHead;
+
+    public void setAlarmId(String alarmId) {
+        if (StrUtil.isNotBlank(alarmId)) {
+            this.alarmId = alarmId;
+        } else {
+            this.alarmId = null;
+        }
+    }
+
+    public void setProvinceId(String provinceId) {
+        if (StrUtil.isNotBlank(provinceId)) {
+            this.provinceId = provinceId;
+        } else {
+            this.provinceId = null;
+        }
+    }
+
+    public void setProvinceName(String provinceName) {
+        if (StrUtil.isNotBlank(provinceName)) {
+            this.provinceName = provinceName;
+        } else {
+            this.provinceName = null;
+        }
+    }
+
+    public void setBillType(String billType) {
+        if (StrUtil.isNotBlank(billType)) {
+            this.billType = billType;
+        } else {
+            this.billType = null;
+        }
+    }
+
+    public void setBillNo(String billNo) {
+        if (StrUtil.isNotBlank(billNo)) {
+            this.billNo = billNo;
+        } else {
+            this.billNo = null;
+        }
+    }
+
+    public void setBillName(String billName) {
+        if (StrUtil.isNotBlank(billName)) {
+            this.billName = billName;
+        } else {
+            this.billName = null;
+        }
+    }
+
+    public void setCreaterOrgId(String createrOrgId) {
+        if (StrUtil.isNotBlank(createrOrgId)) {
+            this.createrOrgId = createrOrgId;
+        } else {
+            this.createrOrgId = null;
+        }
+    }
+
+    public void setCreaterOrgName(String createrOrgName) {
+        if (StrUtil.isNotBlank(createrOrgName)) {
+            this.createrOrgName = createrOrgName;
+        } else {
+            this.createrOrgName = null;
+        }
+    }
+
+    public void setSpecialityType(String specialityType) {
+        if (StrUtil.isNotBlank(specialityType)) {
+            this.specialityType = specialityType;
+        } else {
+            this.specialityType = null;
+        }
+    }
+
+    public void setOrgId(String orgId) {
+        if (StrUtil.isNotBlank(orgId)) {
+            this.orgId = orgId;
+        } else {
+            this.orgId = null;
+        }
+    }
+
+    public void setOrgName(String orgName) {
+        if (StrUtil.isNotBlank(orgName)) {
+            this.orgName = orgName;
+        } else {
+            this.orgName = null;
+        }
+    }
+
+    public void setReceiveUserid(String receiveUserid) {
+        if (StrUtil.isNotBlank(receiveUserid)) {
+            this.receiveUserid = receiveUserid;
+        } else {
+            this.receiveUserid = null;
+        }
+    }
+
+    public void setReceiveUserName(String receiveUserName) {
+        if (StrUtil.isNotBlank(receiveUserName)) {
+            this.receiveUserName = receiveUserName;
+        } else {
+            this.receiveUserName = null;
+        }
+    }
+
+    public void setCreaterTime(LocalDateTime createrTime) {
+        this.createrTime = createrTime;
+    }
+
+    public void setManagerDeptId(String managerDeptId) {
+        if (StrUtil.isNotBlank(managerDeptId)) {
+            this.managerDeptId = managerDeptId;
+        } else {
+            this.managerDeptId = null;
+        }
+    }
+
+    public void setManagerDeptName(String managerDeptName) {
+        if (StrUtil.isNotBlank(managerDeptName)) {
+            this.managerDeptName = managerDeptName;
+        } else {
+            this.managerDeptName = null;
+        }
+    }
+
+    public void setMainSenderId(String mainSenderId) {
+        if (StrUtil.isNotBlank(mainSenderId)) {
+            this.mainSenderId = mainSenderId;
+        } else {
+            this.mainSenderId = null;
+        }
+    }
+
+    public void setMainSenderName(String mainSenderName) {
+        if (StrUtil.isNotBlank(mainSenderName)) {
+            this.mainSenderName = mainSenderName;
+        } else {
+            this.mainSenderName = null;
+        }
+    }
+
+    public void setCopySenderId(String copySenderId) {
+        if (StrUtil.isNotBlank(copySenderId)) {
+            this.copySenderId = copySenderId;
+        } else {
+            this.copySenderId = null;
+        }
+    }
+
+    public void setCopySenderName(String copySenderName) {
+        if (StrUtil.isNotBlank(copySenderName)) {
+            this.copySenderName = copySenderName;
+        } else {
+            this.copySenderName = null;
+        }
+    }
+
+    public void setTechSupvBasis(String techSupvBasis) {
+        if (StrUtil.isNotBlank(techSupvBasis)) {
+            this.techSupvBasis = techSupvBasis;
+        } else {
+            this.techSupvBasis = null;
+        }
+    }
+
+    public void setProblemDesc(String problemDesc) {
+        if (StrUtil.isNotBlank(problemDesc)) {
+            this.problemDesc = problemDesc;
+        } else {
+            this.problemDesc = null;
+        }
+    }
+
+    public void setDealAdvise(String dealAdvise) {
+        if (StrUtil.isNotBlank(dealAdvise)) {
+            this.dealAdvise = dealAdvise;
+        } else {
+            this.dealAdvise = null;
+        }
+    }
+
+    public void setIsUploadHead(Integer isUploadHead) {
+        this.isUploadHead = isUploadHead;
+    }
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/gw/PlanHisVO.java

@@ -0,0 +1,210 @@
+package com.njcn.process.pojo.vo.gw;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 监督工作计划变更历史数据表
+ * </p>
+ *
+ * @author wr
+ * @since 2023-09-01
+ */
+@Getter
+
+public class PlanHisVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("Id")
+    private String id;
+
+    @ApiModelProperty("计划表主键")
+    @TableField("Plan_Id")
+    private String planId;
+
+    @ApiModelProperty("计划名称")
+    @TableField("Work_Plan_Name")
+    private String workPlanName;
+
+    @ApiModelProperty("监督单位id 取ISC平台上的组织id")
+    @TableField("Supv_Org_Id")
+    private String supvOrgId;
+
+    @TableField("Supv_Org_Name")
+    private String supvOrgName;
+
+    @ApiModelProperty("计划监督时间")
+    @TableField("plan_Supv_Date")
+    private LocalDate planSupvDate;
+
+    @ApiModelProperty("其他要求")
+    @TableField("Other_Remark")
+    private String otherRemark;
+
+    @ApiModelProperty("调整原因")
+    @TableField("Apply_Comment")
+    private String applyComment;
+
+    @ApiModelProperty("计划状态")
+    @TableField("Plan_Status")
+    private String planStatus;
+
+    @ApiModelProperty("更新人id")
+    @TableField("Update_User_Id")
+    private String updateUserId;
+
+    @TableField("Update_User_Name")
+    private String updateUserName;
+
+    @TableField("Update_Time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("取消标识")
+    @TableField("Delete_Flag")
+    private String deleteFlag;
+
+    @ApiModelProperty("当取消标识为1时必填")
+    @TableField("Delete_Time")
+    private LocalDate deleteTime;
+
+    @ApiModelProperty("上次变更记录主键,	从第二次变更起为必填")
+    @TableField("Parent_Id")
+    private String parentId;
+
+    @ApiModelProperty("调整时间,	审核通过时间")
+    @TableField("Adjust_Time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime adjustTime;
+
+    @ApiModelProperty("0.以上送 1.未上送 2.取消上送 3.待重新上送")
+    @TableField("is_upload_head")
+    private Integer isUploadHead;
+
+    public void setId(String id) {
+        if (StrUtil.isNotBlank(id)) {
+            this.id = id;
+        } else {
+            this.id = null;
+        }
+    }
+
+    public void setPlanId(String planId) {
+        if (StrUtil.isNotBlank(planId)) {
+            this.planId = planId;
+        } else {
+            this.planId = null;
+        }
+    }
+
+    public void setWorkPlanName(String workPlanName) {
+        if (StrUtil.isNotBlank(workPlanName)) {
+            this.workPlanName = workPlanName;
+        } else {
+            this.workPlanName = null;
+        }
+    }
+
+    public void setSupvOrgId(String supvOrgId) {
+        if (StrUtil.isNotBlank(supvOrgId)) {
+            this.supvOrgId = supvOrgId;
+        } else {
+            this.supvOrgId = null;
+        }
+    }
+
+    public void setSupvOrgName(String supvOrgName) {
+        if (StrUtil.isNotBlank(supvOrgName)) {
+            this.supvOrgName = supvOrgName;
+        } else {
+            this.supvOrgName = null;
+        }
+    }
+
+    public void setPlanSupvDate(LocalDate planSupvDate) {
+        this.planSupvDate = planSupvDate;
+    }
+
+    public void setOtherRemark(String otherRemark) {
+        if (StrUtil.isNotBlank(otherRemark)) {
+            this.otherRemark = otherRemark;
+        } else {
+            this.otherRemark = null;
+        }
+    }
+
+    public void setApplyComment(String applyComment) {
+        if (StrUtil.isNotBlank(applyComment)) {
+            this.applyComment = applyComment;
+        } else {
+            this.applyComment = null;
+        }
+    }
+
+    public void setPlanStatus(String planStatus) {
+        if (StrUtil.isNotBlank(planStatus)) {
+            this.planStatus = planStatus;
+        } else {
+            this.planStatus = null;
+        }
+    }
+
+    public void setUpdateUserId(String updateUserId) {
+        if (StrUtil.isNotBlank(updateUserId)) {
+            this.updateUserId = updateUserId;
+        } else {
+            this.updateUserId = null;
+        }
+    }
+
+    public void setUpdateUserName(String updateUserName) {
+        if (StrUtil.isNotBlank(updateUserName)) {
+            this.updateUserName = updateUserName;
+        } else {
+            this.updateUserName = null;
+        }
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public void setDeleteFlag(String deleteFlag) {
+        if (StrUtil.isNotBlank(deleteFlag)) {
+            this.deleteFlag = deleteFlag;
+        } else {
+            this.deleteFlag = null;
+        }
+    }
+
+    public void setDeleteTime(LocalDate deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    public void setParentId(String parentId) {
+        if (StrUtil.isNotBlank(parentId)) {
+            this.parentId = parentId;
+        } else {
+            this.parentId = null;
+        }
+    }
+
+    public void setAdjustTime(LocalDateTime adjustTime) {
+        this.adjustTime = adjustTime;
+    }
+
+    public void setIsUploadHead(Integer isUploadHead) {
+        this.isUploadHead = isUploadHead;
+    }
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/gw/PlanVO.java

@@ -0,0 +1,514 @@
+package com.njcn.process.pojo.vo.gw;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @author wr
+ * @description
+ * @date 2023/9/6 9:33
+ */
+@Getter
+public class PlanVO {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private String planId;
+
+    @TableField(exist = false)
+    private String provinceId;
+
+    @TableField(exist = false)
+    private String provinceName;
+
+    @TableField(exist = false)
+    private String cityId;
+
+    @TableField(exist = false)
+    private String cityName;
+
+    @TableField(exist = false)
+    private String countyId;
+
+    @TableField(exist = false)
+    private String countyName;
+
+    /**
+     * 计划名称
+     */
+    private String workPlanName;
+
+    /**
+     * 监督类型
+     */
+    private String supvType;
+
+    /**
+     * 监督阶段
+     */
+    private String supvStage;
+
+    /**
+     * 监督单位
+     */
+    private String supvOrgId;
+
+    /**
+     * 监督单位
+     */
+    @TableField(exist = false)
+    private String supvOrgName;
+
+    /**
+     * 计划监督时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate planSupvDate;
+
+    /**
+     * 计划编制人id
+     */
+    private String planUserId;
+
+    @TableField(exist = false)
+    private String planUserName;
+
+    /**
+     * 计划编制单位id
+     */
+    private String planOrgId;
+
+    @TableField(exist = false)
+    private String planOrgName;
+
+    /**
+     * 备注
+     */
+    private String otherRemark;
+
+    /**
+     * 计划执行开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime effectStartTime;
+
+    /**
+     * 计划执行结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime effectEndTime;
+
+
+    /**
+     * 实施状态
+     */
+    private String effectStatus;
+
+    /**
+     * 监督对象名称
+     */
+
+    private String supvObjName;
+
+    @TableField(exist = false)
+    private String supvObjId;
+
+    /**
+     * 对象类型
+     */
+    private String supvObjType;
+
+    /**
+     * 对象电压等级
+     */
+    private String objVoltageLevel;
+
+    @TableField(exist = false)
+    private String objVoltageLevelName;
+
+    /**
+     * 关联电站
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String substationName;
+
+
+    /**
+     * 关联电站电压等级
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String substationVoltageLevel;
+
+    /**
+     * 关联电站电压等级名称
+     */
+    @TableField(exist = false)
+    private String substationVoltageLevelName;
+
+
+    /**
+     * 监督对象属性
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String objType;
+
+    /**
+     * 监督对象属性名称
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String objTypeName;
+
+    /**
+     * 监督对象协议容量(MVA)
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Double objCapacity;
+
+
+    /**
+     * 报告出具时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime reportIssueTime;
+
+    /**
+     * 电能质量问题发生时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime problemOcTime;
+
+
+    /**
+     * 0.未上送 1.上送 2.取消上送
+     */
+    private Integer isUploadHead;
+
+    /**
+     * 删除标识	0否1是
+     */
+    private String deleteFlag = "0";
+    /**
+     * 计划状态	1新建2变更 3取消
+     */
+    private String planStatus;
+    /**
+     * 删除时间
+     */
+    private LocalDateTime deleteTime;
+    /**
+     * 实施人id
+     */
+    private String effectUserId;
+    /**
+     * 实施人姓名
+     */
+    private String effectUserName;
+
+    public void setPlanId(String planId) {
+        if (StrUtil.isNotBlank(planId)) {
+            this.planId = planId;
+        } else {
+            this.planId = null;
+        }
+
+    }
+
+    public void setProvinceId(String provinceId) {
+        if (StrUtil.isNotBlank(provinceId)) {
+            this.provinceId = provinceId;
+        } else {
+            this.provinceId = null;
+        }
+    }
+
+    public void setProvinceName(String provinceName) {
+        if (StrUtil.isNotBlank(provinceName)) {
+            this.provinceName = provinceName;
+        } else {
+            this.provinceName = null;
+        }
+    }
+
+    public void setCityId(String cityId) {
+        if (StrUtil.isNotBlank(cityId)) {
+            this.cityId = cityId;
+        } else {
+            this.cityId = null;
+        }
+
+    }
+
+    public void setCityName(String cityName) {
+        if (StrUtil.isNotBlank(cityName)) {
+            this.cityName = cityName;
+        } else {
+            this.cityName = null;
+        }
+    }
+
+    public void setCountyId(String countyId) {
+        if (StrUtil.isNotBlank(countyId)) {
+            this.countyId = countyId;
+        } else {
+            this.countyId = null;
+        }
+    }
+
+    public void setCountyName(String countyName) {
+        if (StrUtil.isNotBlank(countyName)) {
+            this.countyName = countyName;
+        } else {
+            this.countyName = null;
+        }
+    }
+
+    public void setWorkPlanName(String workPlanName) {
+        if (StrUtil.isNotBlank(workPlanName)) {
+            this.workPlanName = workPlanName;
+        } else {
+            this.workPlanName = null;
+        }
+    }
+
+    public void setSupvType(String supvType) {
+        if (StrUtil.isNotBlank(supvType)) {
+            this.supvType = supvType;
+        } else {
+            this.supvType = null;
+        }
+    }
+
+    public void setSupvStage(String supvStage) {
+        if (StrUtil.isNotBlank(supvStage)) {
+            this.supvStage = supvStage;
+        } else {
+            this.supvStage = null;
+        }
+    }
+
+    public void setSupvOrgId(String supvOrgId) {
+        if (StrUtil.isNotBlank(supvOrgId)) {
+            this.supvOrgId = supvOrgId;
+        } else {
+            this.supvOrgId = null;
+        }
+    }
+
+    public void setSupvOrgName(String supvOrgName) {
+        if (StrUtil.isNotBlank(supvOrgName)) {
+            this.supvOrgName = supvOrgName;
+        } else {
+            this.supvOrgName = null;
+        }
+    }
+
+    public void setPlanSupvDate(LocalDate planSupvDate) {
+        this.planSupvDate = planSupvDate;
+    }
+
+    public void setPlanUserId(String planUserId) {
+        if (StrUtil.isNotBlank(planUserId)) {
+            this.planUserId = planUserId;
+        } else {
+            this.planUserId = null;
+        }
+    }
+
+    public void setPlanUserName(String planUserName) {
+        if (StrUtil.isNotBlank(planUserName)) {
+            this.planUserName = planUserName;
+        } else {
+            this.planUserName = null;
+        }
+    }
+
+    public void setPlanOrgId(String planOrgId) {
+        if (StrUtil.isNotBlank(planOrgId)) {
+            this.planOrgId = planOrgId;
+        } else {
+            this.planOrgId = null;
+        }
+    }
+
+    public void setPlanOrgName(String planOrgName) {
+        if (StrUtil.isNotBlank(planOrgName)) {
+            this.planOrgName = planOrgName;
+        } else {
+            this.planOrgName = null;
+        }
+    }
+
+    public void setOtherRemark(String otherRemark) {
+        if (StrUtil.isNotBlank(otherRemark)) {
+            this.otherRemark = otherRemark;
+        } else {
+            this.otherRemark = null;
+        }
+    }
+
+    public void setEffectStartTime(LocalDateTime effectStartTime) {
+        this.effectStartTime = effectStartTime;
+
+    }
+
+    public void setEffectEndTime(LocalDateTime effectEndTime) {
+        this.effectEndTime = effectEndTime;
+
+    }
+
+    public void setEffectStatus(String effectStatus) {
+        if (StrUtil.isNotBlank(effectStatus)) {
+            this.effectStatus = effectStatus;
+        } else {
+            this.effectStatus = null;
+        }
+    }
+
+    public void setSupvObjName(String supvObjName) {
+        if (StrUtil.isNotBlank(supvObjName)) {
+            this.supvObjName = supvObjName;
+        } else {
+            this.supvObjName = null;
+        }
+    }
+
+    public void setSupvObjId(String supvObjId) {
+        if (StrUtil.isNotBlank(supvObjId)) {
+            this.supvObjId = supvObjId;
+        } else {
+            this.supvObjId = null;
+        }
+    }
+
+    public void setSupvObjType(String supvObjType) {
+        if (StrUtil.isNotBlank(supvObjType)) {
+            this.supvObjType = supvObjType;
+        } else {
+            this.supvObjType = null;
+        }
+    }
+
+    public void setObjVoltageLevel(String objVoltageLevel) {
+        if (StrUtil.isNotBlank(objVoltageLevel)) {
+            this.objVoltageLevel = objVoltageLevel;
+        } else {
+            this.objVoltageLevel = null;
+        }
+    }
+
+    public void setObjVoltageLevelName(String objVoltageLevelName) {
+        if (StrUtil.isNotBlank(objVoltageLevelName)) {
+            this.objVoltageLevelName = objVoltageLevelName;
+        } else {
+            this.objVoltageLevelName = null;
+        }
+    }
+
+    public void setSubstationName(String substationName) {
+        if (StrUtil.isNotBlank(substationName)) {
+            this.substationName = substationName;
+        } else {
+            this.substationName = null;
+        }
+    }
+
+    public void setSubstationVoltageLevel(String substationVoltageLevel) {
+        if (StrUtil.isNotBlank(substationVoltageLevel)) {
+            this.substationVoltageLevel = substationVoltageLevel;
+        } else {
+            this.substationVoltageLevel = null;
+        }
+    }
+
+    public void setSubstationVoltageLevelName(String substationVoltageLevelName) {
+        if (StrUtil.isNotBlank(substationVoltageLevelName)) {
+            this.substationVoltageLevelName = substationVoltageLevelName;
+        } else {
+            this.substationVoltageLevelName = null;
+        }
+    }
+
+    public void setObjType(String objType) {
+        if (StrUtil.isNotBlank(objType)) {
+            this.objType = objType;
+        } else {
+            this.objType = null;
+        }
+    }
+
+    public void setObjTypeName(String objTypeName) {
+        if (StrUtil.isNotBlank(objTypeName)) {
+            this.objTypeName = objTypeName;
+        } else {
+            this.objTypeName = null;
+        }
+    }
+
+    public void setObjCapacity(Double objCapacity) {
+        if (ObjectUtil.isNotNull(objCapacity)) {
+            this.objCapacity = objCapacity;
+        } else {
+            this.objCapacity = null;
+        }
+    }
+
+    public void setReportIssueTime(LocalDateTime reportIssueTime) {
+        this.reportIssueTime = reportIssueTime;
+    }
+
+    public void setProblemOcTime(LocalDateTime problemOcTime) {
+        this.problemOcTime = problemOcTime;
+    }
+
+    public void setIsUploadHead(Integer isUploadHead) {
+        this.isUploadHead = isUploadHead;
+    }
+
+    public void setDeleteFlag(String deleteFlag) {
+        if (StrUtil.isNotBlank(deleteFlag)) {
+            this.deleteFlag = deleteFlag;
+        } else {
+            this.deleteFlag = null;
+        }
+    }
+
+    public void setPlanStatus(String planStatus) {
+        if (StrUtil.isNotBlank(planStatus)) {
+            this.planStatus = planStatus;
+        } else {
+            this.planStatus = null;
+        }
+    }
+
+    public void setDeleteTime(LocalDateTime deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    public void setEffectUserId(String effectUserId) {
+        if (StrUtil.isNotBlank(effectUserId)) {
+            this.effectUserId = effectUserId;
+        } else {
+            this.effectUserId = null;
+        }
+    }
+
+    public void setEffectUserName(String effectUserName) {
+        if (StrUtil.isNotBlank(effectUserName)) {
+            this.effectUserName = effectUserName;
+        } else {
+            this.effectUserName = null;
+        }
+    }
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/gw/ProblemVO.java

@@ -0,0 +1,337 @@
+package com.njcn.process.pojo.vo.gw;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-06-21
+ */
+@Getter
+public class ProblemVO extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private String problemId;
+
+    /**
+     * 所属网省id
+     */
+    @TableField(exist = false)
+    private String provinceId;
+
+
+    /**
+     * 关联计划表
+     */
+    private String planId;
+
+    /**
+     * 责任单位id，取ISC平台上的组织id
+     */
+    private String dutyOrgId;
+
+    @TableField(exist = false)
+    private String dutyOrgName;
+
+    /**
+     * 监测点类型 ，仅供电电压监督计划必填
+     */
+    private String monitorType;
+
+    /**
+     * 整改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime rectificationTime;
+
+    /**
+     * 计划整改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime planRectificationTime;
+
+    /**
+     * 是否发布预告警
+     */
+    private Integer ifReleaseWarning;
+
+    /**
+     * 问题简要描述
+     */
+    private String simpleProblemDesc;
+
+    /**
+     * 监督标准序号
+     */
+    private String supvStandardSort;
+
+    /**
+     * 问题描述
+     */
+    private String problemDesc;
+
+    /**
+     * 监督标准
+     */
+    private String supvStandard;
+
+    /**
+     * 标准出处
+     */
+    private String supvResouce;
+
+    /**
+     * 问题等级	01 一般，02 较大
+     */
+    private String problemLevel;
+
+    /**
+     * 定级依据
+     */
+    private String problemLevelReason;
+
+    /**
+     * 问题类型
+     */
+    private String problemType;
+
+    /**
+     * 整改方案
+     */
+    private String rectificationProgramme;
+
+    /**
+     * 整改情况01已整改，02未整改
+     */
+    private String rectificationStatus;
+
+
+    /**
+     * 整改措施
+     */
+    private String rectificationMeasure;
+
+
+    /**
+     * 0.以上送 1.未上送 2.取消上送
+     */
+    private Integer isUploadHead;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "attachmentName", value = "盖章报告")
+    private String attachmentName;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "attachmentNameTwo", value = "佐证材料")
+    private String attachmentNameTwo;
+
+    /**
+     * 问题发现时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime discoveryTime;
+
+    public void setProblemId(String problemId) {
+        if (StrUtil.isNotBlank(problemId)) {
+            this.problemId = problemId;
+        } else {
+            this.problemId = null;
+        }
+    }
+
+    public void setProvinceId(String provinceId) {
+        if (StrUtil.isNotBlank(provinceId)) {
+            this.provinceId = provinceId;
+        } else {
+            this.provinceId = null;
+        }
+    }
+
+    public void setPlanId(String planId) {
+        if (StrUtil.isNotBlank(planId)) {
+            this.planId = planId;
+        } else {
+            this.planId = null;
+        }
+    }
+
+    public void setDutyOrgId(String dutyOrgId) {
+        if (StrUtil.isNotBlank(dutyOrgId)) {
+            this.dutyOrgId = dutyOrgId;
+        } else {
+            this.dutyOrgId = null;
+        }
+    }
+
+    public void setDutyOrgName(String dutyOrgName) {
+        if (StrUtil.isNotBlank(dutyOrgName)) {
+            this.dutyOrgName = dutyOrgName;
+        } else {
+            this.dutyOrgName = null;
+        }
+    }
+
+    public void setMonitorType(String monitorType) {
+        if (StrUtil.isNotBlank(monitorType)) {
+            this.monitorType = monitorType;
+        } else {
+            this.monitorType = null;
+        }
+    }
+
+    public void setRectificationTime(LocalDateTime rectificationTime) {
+        this.rectificationTime = rectificationTime;
+    }
+
+    public void setPlanRectificationTime(LocalDateTime planRectificationTime) {
+        this.planRectificationTime = planRectificationTime;
+    }
+
+    public void setIfReleaseWarning(Integer ifReleaseWarning) {
+        this.ifReleaseWarning = ifReleaseWarning;
+    }
+
+    public void setSimpleProblemDesc(String simpleProblemDesc) {
+        if (StrUtil.isNotBlank(simpleProblemDesc)) {
+            this.simpleProblemDesc = simpleProblemDesc;
+        } else {
+            this.simpleProblemDesc = null;
+        }
+    }
+
+    public void setSupvStandardSort(String supvStandardSort) {
+        if (StrUtil.isNotBlank(supvStandardSort)) {
+            this.supvStandardSort = supvStandardSort;
+        } else {
+            this.supvStandardSort = null;
+        }
+    }
+
+    public void setProblemDesc(String problemDesc) {
+        if (StrUtil.isNotBlank(problemDesc)) {
+            this.problemDesc = problemDesc;
+        } else {
+            this.problemDesc = null;
+        }
+    }
+
+    public void setSupvStandard(String supvStandard) {
+        if (StrUtil.isNotBlank(supvStandard)) {
+            this.supvStandard = supvStandard;
+        } else {
+            this.supvStandard = null;
+        }
+    }
+
+    public void setSupvResouce(String supvResouce) {
+        if (StrUtil.isNotBlank(supvResouce)) {
+            this.supvResouce = supvResouce;
+        } else {
+            this.supvResouce = null;
+        }
+    }
+
+    public void setProblemLevel(String problemLevel) {
+        if (StrUtil.isNotBlank(problemLevel)) {
+            this.problemLevel = problemLevel;
+        } else {
+            this.problemLevel = null;
+        }
+    }
+
+    public void setProblemLevelReason(String problemLevelReason) {
+        if (StrUtil.isNotBlank(problemLevelReason)) {
+            this.problemLevelReason = problemLevelReason;
+        } else {
+            this.problemLevelReason = null;
+        }
+    }
+
+    public void setProblemType(String problemType) {
+        if (StrUtil.isNotBlank(problemType)) {
+            this.problemType = problemType;
+        } else {
+            this.problemType = null;
+        }
+    }
+
+    public void setRectificationProgramme(String rectificationProgramme) {
+        if (StrUtil.isNotBlank(rectificationProgramme)) {
+            this.rectificationProgramme = rectificationProgramme;
+        } else {
+            this.rectificationProgramme = null;
+        }
+    }
+
+    public void setRectificationStatus(String rectificationStatus) {
+        if (StrUtil.isNotBlank(rectificationStatus)) {
+            this.rectificationStatus = rectificationStatus;
+        } else {
+            this.rectificationStatus = null;
+        }
+    }
+
+    public void setRectificationMeasure(String rectificationMeasure) {
+        if (StrUtil.isNotBlank(rectificationMeasure)) {
+            this.rectificationMeasure = rectificationMeasure;
+        } else {
+            this.rectificationMeasure = null;
+        }
+    }
+
+    public void setIsUploadHead(Integer isUploadHead) {
+        this.isUploadHead = isUploadHead;
+    }
+
+    public void setRemark(String remark) {
+        if (StrUtil.isNotBlank(remark)) {
+            this.remark = remark;
+        } else {
+            this.remark = null;
+        }
+    }
+
+    public void setAttachmentName(String attachmentName) {
+        if (StrUtil.isNotBlank(attachmentName)) {
+            this.attachmentName = attachmentName;
+        } else {
+            this.attachmentName = null;
+        }
+    }
+
+    public void setAttachmentNameTwo(String attachmentNameTwo) {
+        if (StrUtil.isNotBlank(attachmentNameTwo)) {
+            this.attachmentNameTwo = attachmentNameTwo;
+        } else {
+            this.attachmentNameTwo = null;
+        }
+        this.attachmentNameTwo = attachmentNameTwo;
+    }
+
+    public void setDiscoveryTime(LocalDateTime discoveryTime) {
+        this.discoveryTime = discoveryTime;
+    }
+}