init

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewAddCmd.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import org.qinan.safetyeval.domain.constant.QualOnSiteReviewStatusEnum;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -22,6 +23,7 @@ public class QualOnSiteReviewAddCmd implements Serializable {
      * 资质类型:add 新增 ，change:变更
      */
     @ApiModelProperty(value = "资质类型:add 新增 ，change:变更")
+    @Size(max = 64, message = "资质类型不能超过64个字符")
     private String bizType;
     /**
      * 业务id
@@ -38,11 +40,13 @@ public class QualOnSiteReviewAddCmd implements Serializable {
      * 审查地点
      */
     @ApiModelProperty(value = "审查地点")
+    @Size(max = 512, message = "审查地点不能超过512个字符")
     private String reviewLocation;
     /**
      * 审查组成员名单
      */
     @ApiModelProperty(value = "审查组成员名单")
+    @Size(max = 512, message = "审查组成员名单不能超过512个字符")
     private String reviewMembers;
     /**
      * 材料准备要求
@@ -53,26 +57,32 @@ public class QualOnSiteReviewAddCmd implements Serializable {
      * 监管联系人姓名
      */
     @ApiModelProperty(value = "监管联系人姓名")
+    @Size(max = 64, message = "监管联系人姓名不能超过64个字符")
     private String supervisorContact;
     /**
      * 监管联系电话
      */
     @ApiModelProperty(value = "监管联系电话")
+    @Size(max = 32, message = "监管联系电话不能超过32个字符")
     private String contactPhone;
     /**
      * 现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过)
      */
     @ApiModelProperty(value = QualOnSiteReviewStatusEnum.REMARKS, required = true)
+    @NotNull(message = "现场审查状态不能为空")
+    @Size(max = 64, message = "现场审查状态不能超过64个字符")
     private String status;
     /**
      * 审查意见
      */
     @ApiModelProperty(value = "审查意见")
+    @Size(max = 256, message = "审查意见不能超过256个字符")
     private String reviewOpinion;
     /**
      * 环境
      */
     @ApiModelProperty(value = "环境")
+    @Size(max = 50, message = "环境不能超过50个字符")
     private String env;
 
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewUpdateCmd.java

@@ -3,8 +3,10 @@ package org.qinan.safetyeval.client.review.request;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.qinan.safetyeval.domain.constant.QualOnSiteReviewStatusEnum;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -18,11 +20,13 @@ import java.time.LocalDateTime;
 public class QualOnSiteReviewUpdateCmd implements Serializable {
     private static final long serialVersionUID = 1L;
     @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @NotNull(message = "id不能为空")
     private Long id;
     /**
      * 资质类型:add 新增 ，change:变更
      */
     @ApiModelProperty(value = "资质类型:add 新增 ，change:变更")
+    @Size(max = 64, message = "资质类型不能超过64个字符")
     private String bizType;
     /**
      * 业务id
@@ -33,17 +37,20 @@ public class QualOnSiteReviewUpdateCmd implements Serializable {
      * 现场审查开始时间
      */
     @ApiModelProperty(value = "现场审查开始时间", required = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @NotNull(message = "现场审查开始时间不能为空")
     private LocalDateTime reviewDateStart;
     /**
      * 审查地点
      */
     @ApiModelProperty(value = "审查地点")
+    @Size(max = 512, message = "审查地点不能超过512个字符")
     private String reviewLocation;
     /**
      * 审查组成员名单
      */
     @ApiModelProperty(value = "审查组成员名单")
+    @Size(max = 512, message = "审查组成员名单不能超过512个字符")
     private String reviewMembers;
     /**
      * 材料准备要求
@@ -54,29 +61,25 @@ public class QualOnSiteReviewUpdateCmd implements Serializable {
      * 监管联系人姓名
      */
     @ApiModelProperty(value = "监管联系人姓名")
+    @Size(max = 64, message = "监管联系人姓名不能超过64个字符")
     private String supervisorContact;
     /**
      * 监管联系电话
      */
     @ApiModelProperty(value = "监管联系电话")
+    @Size(max = 32, message = "监管联系电话不能超过32个字符")
     private String contactPhone;
     /**
      * 现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过)
      */
-    @ApiModelProperty(value = "现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过)", required = true)
+    @ApiModelProperty(value = QualOnSiteReviewStatusEnum.REMARKS, required = true)
-    @NotNull(message = "现场审查状态(AGENCY_PENDING_CONFIRMATION机构待确认、AGENCY_CONFIRMED机构已确认、REVIEW_PASSED核查通过、REVIEW_FAILED核查不通过)不能为空")
+    @NotNull(message = QualOnSiteReviewStatusEnum.REMARKS + "不能为空")
+    @Size(max = 64, message = "现场审查状态不能超过64个字符")
     private String status;
     /**
      * 审查意见
      */
     @ApiModelProperty(value = "审查意见")
+    @Size(max = 256, message = "审查意见不能超过256个字符")
     private String reviewOpinion;
-    /**
-     * 环境
-     */
-    @ApiModelProperty(value = "环境")
-    private String env;
-    @NotNull(message = "version不能为空")
-    @ApiModelProperty(value = "version")
-    private Integer version;
 }