From cfdaaae8690e188f6971057259873aa408ebc9e3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 16:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 231 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 121 insertions(+), 110 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 454836a..d6fcac0 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
@@ -6,164 +6,149 @@
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.Size;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
- * 妫�楠屼笅鍗�
- *
- * @TableName ins_order
- */
-@TableName(value = "ins_order")
+* 妫�楠屼笅鍗�
+* @TableName ins_order
+*/
@Data
+@TableName("ins_order")
public class InsOrder extends OrderBy implements Serializable {
- /**
- *
- */
+
+ @ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
private Integer id;
/**
- * 濮旀墭缂栧彿
- */
- @ValueTableShow(1)
+ * 濮旀墭缂栧彿
+ */
+ @ValueTableShow(2)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty(value = "濮旀墭缂栧彿")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
- /**
- * 鏍峰搧缂栫爜
- */
@ValueTableShow(2)
- @ApiModelProperty(value = "鏍峰搧缂栫爜")
- private String sampleCode;
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty(value = "妫�楠岀被鍒�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String orderType;
/**
- * 鏍峰搧绫诲瀷
- */
+ * 涓嬪崟瀹㈡埛
+ */
@ValueTableShow(3)
- @ApiModelProperty(value = "鏍峰搧绫诲瀷")
- private String sampleType;
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("濮旀墭瀹㈡埛")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String custom;
/**
- * 鏍峰搧绫诲瀷
- */
- @ValueTableShow(3)
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
- private String sample;
-
-
- /**
- * 鏍峰搧鏁伴噺
- */
+ * 涓嬪崟鍗曚綅
+ */
@ValueTableShow(4)
- @ApiModelProperty(value = "鏍峰搧鏁伴噺")
- private Integer sampleNum;
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("濮旀墭鍗曚綅")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String company;
+
+ @ValueTableShow(4)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("鑱旂郴鏂瑰紡")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String phone;
/**
- * 绱ф�ョ▼搴�
- */
- @ValueTableShow(5)
- @ApiModelProperty(value = "绱ф�ョ▼搴�")
+ * 宸ュ巶鍩�
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("宸ュ巶鍩�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String code;
+
+ /**
+ * 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
+ */
+ @ValueTableShow(value = 6, name = "绱ф�ョ▼搴�")
+ @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
private Integer type;
/**
- * 绾﹀畾鏃堕棿
- */
- @ValueTableShow(6)
- @ApiModelProperty(value = "绾﹀畾鏃堕棿")
+ * 绾﹀畾鏃堕棿
+ */
+ @ValueTableShow(7)
+ @ApiModelProperty("绾﹀畾鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate appointed;
- /**
- * 妫�娴嬭繘搴�
- */
+// @ValueTableShow(7)
+ @ApiModelProperty("妫�楠岀粨鏋�")
+ private Integer insResult;
+
@ValueTableShow(7)
- @ApiModelProperty(value = "妫�娴嬭繘搴�")
- private String insProgress;
+ @ApiModelProperty("鏍峰搧澶勭悊鏂瑰紡")
+ private Integer processing;
- /**
- * 涓嬪崟瀹㈡埛
- */
- @ValueTableShow(8)
- @ApiModelProperty(value = "涓嬪崟瀹㈡埛")
- private String custom;
-
- /**
- * 涓嬪崟鍗曚綅
- */
- @ValueTableShow(9)
- @ApiModelProperty(value = "涓嬪崟鍗曚綅")
- private String company;
-
- /**
- * 宸ュ巶鍩�
- */
- @ValueTableShow(10)
- @ApiModelProperty(value = "宸ュ巶鍩�")
- private String code;
-
- /**
- * 瀹為獙瀹ゅ悕绉�
- */
- @ValueTableShow(11)
- @ApiModelProperty(value = "瀹為獙瀹ゅ悕绉�")
- private String laboratory;
-
- /**
- * 瑙勬牸鍨嬪彿
- */
- @ValueTableShow(12)
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
- private String model;
-
- /**
- * 鏄惁鐣欐牱
- */
- @ValueTableShow(13)
- @ApiModelProperty(value = "鏄惁鐣欐牱")
+ @ValueTableShow(7)
+ @ApiModelProperty("鏄惁鐣欐牱")
private Integer isLeave;
/**
- * 鐣欐牱鏁伴噺
- */
- @ValueTableShow(14)
- @ApiModelProperty(value = "鐣欐牱鏁伴噺")
- private Integer leaveNum;
-
- /**
- * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
- */
+ * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
+ */
+ @ApiModelProperty("鐘舵��")
private Integer state;
/**
- * 澶囨敞
- */
+ * 澶囨敞
+ */
+ @ValueTableShow(9)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("澶囨敞")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String remark;
/**
- * OTC璁㈠崟鍙�
- */
+ * OTC璁㈠崟鍙�
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("OTC璁㈠崟鍙�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String otcCode;
- @ApiModelProperty("鍒涘缓浜�")
+ @ValueTableShow(11)
+ @ApiModelProperty("涓嬪崟浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
/**
*
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ValueTableShow(12)
+ @ApiModelProperty("涓嬪崟鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
+ @ValueTableShow(13)
+ @ApiModelProperty("涓嬪彂鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sendTime;
+
/**
*
*/
- @ApiModelProperty("淇敼浜�")
+ @ApiModelProperty("")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+
/**
*
*/
@@ -174,16 +159,42 @@
private Integer userId;
- @ApiModelProperty(value = "妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)")
+ private Integer mating;
+
+ @ApiModelProperty("妫�楠岀姸鎬�(0锛氬緟妫�楠� 1:妫�楠屼腑 2:宸叉楠� 3锛氬緟澶嶆牳 4锛氬鏍告湭閫氳繃 5锛氬鏍搁�氳繃)")
private Integer insState;
- @ApiModelProperty(value = "妫�楠岀粨鏋�(0锛氫笉鍚堟牸 1锛氬悎鏍�)")
- private Integer insResult;
-
- @ApiModelProperty(value = "涓嬪彂鏃堕棿")
- private LocalDateTime sendTime;
-
- @ApiModelProperty(value = "宸ュ巶")
+ /**
+ * 妫�楠屽伐鍘�
+ */
private String factory;
-}
\ No newline at end of file
+ /**
+ * 瀹為獙瀹ゅ悕绉�
+ */
+ private String laboratory;
+
+ /**
+ * 鏍峰搧绫诲瀷
+ */
+ private String sampleType;
+
+ /**
+ * 鏍峰搧鍚嶇О
+ */
+ private String sample;
+
+ @ApiModelProperty("妫�楠屾椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime insTime;
+
+ @ValueTableShow(value = 14, name = "閫�鍥炵悊鐢�")
+ private String tell;
+
+ @ValueTableShow(value = 15, name = "鎶ュ憡鍙戦�佹柟寮�")
+ private Integer send;
+
+ @ValueTableShow(value = 16, name = "鏉ユ牱鏂瑰紡")
+ private String formType;
+
+}
--
Gitblit v1.9.3