Merge branch 'master' of http://192.168.1.22:3000/root/pqs

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/plan/SupervisionProblemPO.java

@@ -72,7 +72,7 @@ public class SupervisionProblemPO extends BaseEntity {
      * 是否发布预告警
      */
     @TableField(value = "if_Release_Warning")
-    private Boolean ifReleaseWarning;
+    private String ifReleaseWarning;
 
     @TableField(value = "problem_Desc")
     private String problemDesc;
@@ -138,7 +138,7 @@ public class SupervisionProblemPO extends BaseEntity {
      * 是否上送国网 0.未上送 1.上送
      */
     @TableField(value = "is_Upload_Head")
-    private Boolean isUploadHead;
+    private String isUploadHead;
 
     /**
      * 问题发现时间

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/plan/SupervisionPlanVO.java

@@ -66,8 +66,7 @@ public class SupervisionPlanVO {
      * 计划监督时间
      */
     @ApiModelProperty(value = "计划监督时间",required = true)
-    @JsonFormat(pattern = "yyyy-MM")
-    private String planSupvDate;
+    private LocalDateTime planSupvDate;
 
     /**
      * 监督对象名称
@@ -180,4 +179,17 @@ public class SupervisionPlanVO {
 
     @ApiModelProperty(value = "计划状态")
     private String planStatus;
+
+    /**
+     * 1:审批中；2：审批通过；3：审批不通过；4：已取消
+     */
+    @ApiModelProperty(value = "审批状态")
+    private Integer status;
+
+    /**
+     * 流程实例的编号
+     */
+    @ApiModelProperty(value = "流程实例的编号")
+    private String processInstanceId;
+
 }