update 项目合规评估流程 新增字段

laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.aspect.annotation.Dict;
@@ -15,6 +16,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+
 
 /**
  * @Description: 标准评估结果
@@ -35,6 +38,11 @@ public class LawsAssessResults implements Serializable {
     @ApiModelProperty(value = "主键")
     private String id;
 
+    /**项目ID*/
+    @NotBlank(message = "projectId not null")
+    @ApiModelProperty(value = "项目ID")
+    private String projectId;
+
 	/**标准评估ID*/
     @ApiModelProperty(value = "标准评估ID")
     private String assessId;
@@ -90,6 +98,22 @@ public class LawsAssessResults implements Serializable {
     @ApiModelProperty(value = "项目编号")
     private String projectNo;
 
+    /**
+     * 依据描述
+     */
+    @ApiModelProperty(value = "依据描述")
+    private String description;
+
+    /**
+     * 佐证材料
+     */
+    @ApiModelProperty(value = "佐证材料")
+    private String fileId;
+
+    /**不符合项*/
+    @ApiModelProperty(value = "不符合项")
+    private String nonConformance;
+
     /**应对措施*/
     @ApiModelProperty(value = "应对措施")
     private String countermeasures;
@@ -98,23 +122,20 @@ public class LawsAssessResults implements Serializable {
     @ApiModelProperty(value = "风险点")
     private String riskPoints;
 
-    /**设计工程师名字*/
+    /**验证方案*/
     @ApiModelProperty(value = "验证方案")
     private String validateSolution;
 
-    /**预估更改周期*/
-    @ApiModelProperty(value = "预估更改周期")
-    private String cycle;
+    /**预计整改完成日期*/
+    @ApiModelProperty(value = "预计整改完成日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date expectedTime;
 
     /**不涉及理由*/
     @ApiModelProperty(value = "不涉及理由")
     private String reason;
 
-    /**不符合项*/
-    @ApiModelProperty(value = "不符合项")
-    private String nonconformance;
-
-
     /**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;