diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectionitem/vo/InspectionItemSaveReqVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectionitem/vo/InspectionItemSaveReqVO.java index 5bc5666..8b5e484 100644 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectionitem/vo/InspectionItemSaveReqVO.java +++ b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectionitem/vo/InspectionItemSaveReqVO.java @@ -1,9 +1,11 @@ package cn.iocoder.yudao.module.configure.controller.admin.inspectionitem.vo; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; @ApiModel("管理后台 - 检测报告模板检测项目保存 Request VO") @Data @@ -13,15 +15,18 @@ public class InspectionItemSaveReqVO { private Long id; @ApiModelProperty(value = "检测项目", required = true) - @NotNull(message = "检测项目不能为空") + @NotBlank(message = "检测项目不能为空") + @Length(max = 64, message = "检测报告模板名称长度必须是1~64位之间") private String inspectionItem; @ApiModelProperty(value = "检测项目单位", required = true) - @NotNull(message = "检测项目单位不能为空") + @NotBlank(message = "检测项目单位不能为空") + @Length(max = 64, message = "检测项目单位长度必须是1~64位之间") private String inspectionUnit; @ApiModelProperty(value = "检测项目技术要求", required = true) - @NotNull(message = "检测项目技术要求不能为空") + @NotBlank(message = "检测项目技术要求不能为空") + @Length(max = 255, message = "检测项目技术要求长度必须是1~255位之间") private String inspectionRequire; } diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectiontemplate/vo/InspectionTemplateCreateReqVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectiontemplate/vo/InspectionTemplateCreateReqVO.java index 6f309a6..aeacce3 100644 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectiontemplate/vo/InspectionTemplateCreateReqVO.java +++ b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectiontemplate/vo/InspectionTemplateCreateReqVO.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.configure.controller.admin.inspectionitem.vo.Insp import lombok.*; import java.util.*; import io.swagger.annotations.*; +import org.hibernate.validator.constraints.Length; import javax.validation.Valid; import javax.validation.constraints.*; @@ -13,7 +14,8 @@ import javax.validation.constraints.*; public class InspectionTemplateCreateReqVO { @ApiModelProperty(value = "检测报告模板名称", required = true) - @NotNull(message = "检测报告模板名称不能为空") + @NotBlank(message = "检测报告模板名称不能为空") + @Length(max = 64, message = "检测报告模板名称长度必须是1~64位之间") private String templateName; @ApiModelProperty(value = "所属商户id", required = true) diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectiontemplate/vo/InspectionTemplateRespVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectiontemplate/vo/InspectionTemplateRespVO.java index a9a1c09..5d49580 100644 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectiontemplate/vo/InspectionTemplateRespVO.java +++ b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/inspectiontemplate/vo/InspectionTemplateRespVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.configure.controller.admin.inspectiontemplate.vo; import cn.iocoder.yudao.module.configure.controller.admin.inspectionitem.vo.InspectionItemRespVO; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.*; import io.swagger.annotations.*; @@ -17,6 +18,7 @@ public class InspectionTemplateRespVO extends InspectionTemplateBaseVO { private Long id; @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT") private Date createTime; @ApiModelProperty(value = "检测项目集合") diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/HarvestBatchSaveReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/HarvestBatchSaveReqVO.java index ce5b69f..9dcee96 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/HarvestBatchSaveReqVO.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/HarvestBatchSaveReqVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.util.Date; @@ -30,16 +31,18 @@ public class HarvestBatchSaveReqVO { @ApiModelProperty(value = "商品id", required = true) @NotNull(message = "商品id不能为空") + @Length(max = 64) private String goodsId; @ApiModelProperty(value = "商品数量") @NotNull(message = "商品数量不能为空") - @Min(value = 1, message = "商品数量至少为1") + @Min(value = 1, message = "商品数量范围为1~99999999之间") + @Max(value = 99999999, message = "商品数量范围为1~99999999之间") // @JsonSerialize(using = BigDecimalSerializer.class) // 四舍五入 自动保留2位小数 private Integer goodsNum; @ApiModelProperty(value = "采收批次说明") - @Length(max = 255) + @Length(max = 255, message = "采收批次说明最大255个字符") private String remarks; }