From 825da6ff9fbab76ca933930e35575cc8b0e811bd Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 19 三月 2024 17:11:23 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 166 +++++++++++++++++++++---------------------------------
1 files changed, 65 insertions(+), 101 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 0245323..03291bd 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,157 +6,119 @@
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;
-
- /**
- * 鏍峰搧绫诲瀷
- */
+ * 涓嬪崟瀹㈡埛
+ */
@ValueTableShow(3)
- @ApiModelProperty(value = "鏍峰搧绫诲瀷")
- private String sampleType;
-
-
- /**
- * 鏍峰搧鏁伴噺
- */
- @ValueTableShow(4)
- @ApiModelProperty(value = "鏍峰搧鏁伴噺")
- private Integer sampleNum;
-
- /**
- * 绱ф�ョ▼搴�
- */
- @ValueTableShow(5)
- @ApiModelProperty(value = "绱ф�ョ▼搴�")
- private Integer type;
-
- /**
- * 绾﹀畾鏃堕棿
- */
- @ValueTableShow(6)
- @ApiModelProperty(value = "绾﹀畾鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate appointedTime;
-
- /**
- * 妫�娴嬭繘搴�
- */
- @ValueTableShow(7)
- @ApiModelProperty(value = "妫�娴嬭繘搴�")
- private String insProgress;
-
- /**
- * 涓嬪崟瀹㈡埛
- */
- @ValueTableShow(8)
- @ApiModelProperty(value = "涓嬪崟瀹㈡埛")
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("涓嬪崟瀹㈡埛")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String custom;
/**
- * 涓嬪崟鍗曚綅
- */
- @ValueTableShow(9)
- @ApiModelProperty(value = "涓嬪崟鍗曚綅")
+ * 涓嬪崟鍗曚綅
+ */
+ @ValueTableShow(4)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("涓嬪崟鍗曚綅")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String company;
/**
- * 宸ュ巶鍩�
- */
- @ValueTableShow(10)
- @ApiModelProperty(value = "宸ュ巶鍩�")
+ * 宸ュ巶鍩�
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("宸ュ巶鍩�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String code;
/**
- * 瀹為獙瀹ゅ悕绉�
- */
- @ValueTableShow(11)
- @ApiModelProperty(value = "瀹為獙瀹ゅ悕绉�")
- private String laboratory;
+ * 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
+ */
+ @ValueTableShow(value = 6, name = "绱ф�ョ▼搴�")
+ @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
+ private Integer type;
/**
- * 瑙勬牸鍨嬪彿
- */
- @ValueTableShow(12)
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
- private String model;
+ * 绾﹀畾鏃堕棿
+ */
+ @ValueTableShow(7)
+ @ApiModelProperty("绾﹀畾鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate appointed;
/**
- * 鏄惁鐣欐牱
- */
- @ValueTableShow(13)
- @ApiModelProperty(value = "鏄惁鐣欐牱")
- private Integer isLeave;
-
- /**
- * 鐣欐牱鏁伴噺
- */
- @ValueTableShow(14)
- @ApiModelProperty(value = "鐣欐牱鏁伴噺")
- private Double 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;
+
/**
*
*/
- @ApiModelProperty("淇敼浜�")
+ @ApiModelProperty("")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+
/**
*
*/
@@ -167,4 +129,6 @@
private Integer userId;
-}
\ No newline at end of file
+ private Integer mating;
+
+}
--
Gitblit v1.9.3