1.现场监督计划调整

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

@@ -153,6 +153,9 @@ public class SupvProblemParam extends BaseParam {
     @DateTimeStrValid(format="yyyy-MM-dd HH:mm:ss",message = "问题发现时间格式有误")
     private String discoveryTime;
 
+    @ApiModelProperty("告预警单id,当ifReleaseWarning为是时，必填")
+    private String workAlarmId;
+
     @EqualsAndHashCode(callSuper = true)
     @Data
     public static class UpdateSupvProblemParam extends SupvProblemParam{

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

@@ -156,4 +156,9 @@ public class SupvProblem extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime discoveryTime;
 
+
+    @ApiModelProperty("告预警单id,当ifReleaseWarning为是时，必填")
+    private String workAlarmId;
+
+
 }

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

@@ -110,4 +110,7 @@ public class SupvProblemVO  {
     @Excel(name = "备注",width = 40)
     private String remark;
 
+    @ApiModelProperty("告预警单id,当ifReleaseWarning为是时，必填")
+    private String workAlarmId;
+
 }

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

@@ -76,9 +76,7 @@ public class AlarmVO {
     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;
+    private Long createrTime;
 
     @ApiModelProperty("主管部门id,取ISC平台上的组织id")
     @TableField("manager_Dept_Id")
@@ -120,6 +118,17 @@ public class AlarmVO {
     @TableField("is_upload_head")
     private Integer isUploadHead;
 
+    @ApiModelProperty("告预警单id,当ifReleaseWarning为是时，必填")
+    private String workAlarmId;
+
+    public String getWorkAlarmId() {
+        return workAlarmId;
+    }
+
+    public void setWorkAlarmId(String workAlarmId) {
+        this.workAlarmId = workAlarmId;
+    }
+
     public void setAlarmId(String alarmId) {
         if (StrUtil.isNotBlank(alarmId)) {
             this.alarmId = alarmId;
@@ -224,7 +233,7 @@ public class AlarmVO {
         }
     }
 
-    public void setCreaterTime(LocalDateTime createrTime) {
+    public void setCreaterTime(Long createrTime) {
         this.createrTime = createrTime;
     }