From 131c6e18ff9f81024e933597788b16287e73f294 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期四, 14 三月 2024 17:37:24 +0800 Subject: [PATCH] 功能调整 --- inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 175 +++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 111 insertions(+), 64 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java index 3bdd0e9..44e35bb 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java @@ -1,119 +1,160 @@ package com.yuanchu.mom.pojo; -import com.baomidou.mybatisplus.annotation.*; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; import java.io.Serializable; + import java.time.LocalDateTime; import java.util.Date; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.validator.constraints.Length; /** - * 妫�楠屼笅鍗� - * @TableName ins_order - */ -@TableName(value ="ins_order") +* 妫�楠屼笅鍗� +* @TableName ins_order +*/ @Data public class InsOrder implements Serializable { + /** - * - */ + * + */ + @NotNull(message="[]涓嶈兘涓虹┖") + @ApiModelProperty("") @TableId(type = IdType.AUTO) private Integer id; - /** - * 濮旀墭缂栧彿 - */ + * 濮旀墭缂栧彿 + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("濮旀墭缂栧彿") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String entrustCode; - /** - * 鏍峰搧缂栫爜 - */ + * 鏍峰搧缂栫爜 + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("鏍峰搧缂栫爜") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String sampleCode; - /** - * 涓嬪崟瀹㈡埛 - */ + * 涓嬪崟瀹㈡埛 + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("涓嬪崟瀹㈡埛") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String custom; - /** - * 涓嬪崟鍗曚綅 - */ + * 涓嬪崟鍗曚綅 + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("涓嬪崟鍗曚綅") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String company; - /** - * 绱ф�ョ▼搴� - */ + * 宸ュ巶鍩� + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("宸ュ巶鍩�") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + private String code; + /** + * 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級 + */ + @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級") private Integer type; - /** - * 绾﹀畾鏃堕棿 - */ - private Date appointedTime; - + * 绾﹀畾鏃堕棿 + */ + @ApiModelProperty("绾﹀畾鏃堕棿") + private Date appointed; /** - * 瀹為獙瀹ゅ悕绉� - */ + * 瀹為獙瀹ゅ悕绉� + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("瀹為獙瀹ゅ悕绉�") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String laboratory; - /** - * 鏍峰搧绫诲瀷 - */ - private String smapleType; - + * 鏍峰搧绫诲瀷 + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("鏍峰搧绫诲瀷") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + private String sampleType; /** - * 瑙勬牸鍨嬪彿 - */ + * 瑙勬牸鍨嬪彿 + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("瑙勬牸鍨嬪彿") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String model; - /** - * 鏍峰搧鍚嶇О - */ + * 鏍峰搧鍚嶇О + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("鏍峰搧鍚嶇О") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String sample; - /** - * 鏍峰搧鏁伴噺 - */ + * 鏍峰搧鏁伴噺 + */ + @ApiModelProperty("鏍峰搧鏁伴噺") private Double sampleNum; - /** - * 鏄惁鐣欐牱 - */ + * 鏄惁鐣欐牱 + */ + @ApiModelProperty("鏄惁鐣欐牱") private Integer isLeave; - /** - * 鐣欐牱鏁伴噺 - */ + * 鐣欐牱鏁伴噺 + */ + @ApiModelProperty("鐣欐牱鏁伴噺") private Integer leaveNum; - /** - * 妫�娴嬭繘搴� + * 妫�娴嬭繘搴� - */ + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("妫�娴嬭繘搴�") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String insProgress; - /** - * 妫�娴嬬粨鏋� - - */ - private String insResult; - - /** - * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿� - */ + * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿� + */ + @ApiModelProperty("1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�") private Integer state; - + /** + * 澶囨敞 + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("澶囨敞") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String remark; + /** + * OTC璁㈠崟鍙� + */ + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("OTC璁㈠崟鍙�") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + private String otcCode; - @ApiModelProperty("") + @ApiModelProperty("涓嬪崟浜�") @TableField(fill = FieldFill.INSERT) private Integer createUser; /** * */ - @ApiModelProperty("鍒涘缓鏃堕棿") + @ApiModelProperty("涓嬪崟鏃堕棿") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; @@ -130,4 +171,10 @@ @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; -} \ No newline at end of file + /** + * 澶栭敭锛氫笅鍗曞鎴� user琛╥d + */ + @ApiModelProperty("澶栭敭锛氫笅鍗曞鎴� user琛╥d") + private Integer userId; + +} -- Gitblit v1.9.3