技术监督代码提交

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

@@ -1,9 +1,6 @@
 package com.njcn.process.pojo.po;
 
-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.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 

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

@@ -15,6 +15,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 
@@ -64,14 +65,15 @@ public class SupvProblem extends BaseEntity {
     /**
      * 整改时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private LocalDate rectificationTime;
+    private LocalDateTime rectificationTime;
 
     /**
      * 计划整改时间
      */
-    private LocalDate planRectificationTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime planRectificationTime;
 
     /**
      * 是否发布预告警
@@ -154,6 +156,9 @@ public class SupvProblem extends BaseEntity {
     @ApiModelProperty(name = "attachmentNameTwo",value = "佐证材料")
     private String attachmentNameTwo;
 
+    /**
+     * 问题发现时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime  discoveryTime;