From 53da067c76ca7d4406b57c1a78565bd7b990868d Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 22 三月 2024 17:58:50 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 244 ++++++++++++++++++++++++++----------------------
1 files changed, 130 insertions(+), 114 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 74ccaf5..fdfc642 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,151 +1,167 @@
package com.yuanchu.mom.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+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.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
/**
- * 妫�楠屼笅鍗�
- * @TableName ins_order
- */
-@TableName(value ="ins_order")
+* 妫�楠屼笅鍗�
+* @TableName ins_order
+*/
@Data
-public class InsOrder implements Serializable {
- /**
- *
- */
+@TableName("ins_order")
+public class InsOrder extends OrderBy implements Serializable {
+
+ @ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
private Integer id;
/**
- * 濮旀墭缂栧彿
- */
+ * 濮旀墭缂栧彿
+ */
+ @ValueTableShow(2)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty(value = "濮旀墭缂栧彿")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
/**
- * 鏍峰搧缂栫爜
- */
- private String sampleCode;
+ * 涓嬪崟瀹㈡埛
+ */
+ @ValueTableShow(3)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("涓嬪崟瀹㈡埛")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String custom;
/**
- * 涓嬪崟瀹㈡埛
- */
- private String orderingCustomers;
+ * 涓嬪崟鍗曚綅
+ */
+ @ValueTableShow(4)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("涓嬪崟鍗曚綅")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String company;
/**
- * 涓嬪崟鍗曚綅
- */
- private String orderingUnit;
+ * 宸ュ巶鍩�
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("宸ュ巶鍩�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String code;
/**
- * 绱ф�ョ▼搴�
- */
- private String urgency;
+ * 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
+ */
+ @ValueTableShow(value = 6, name = "绱ф�ョ▼搴�")
+ @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
+ private Integer type;
/**
- * 绾﹀畾鏃堕棿
+ * 绾﹀畾鏃堕棿
+ */
+ @ValueTableShow(7)
+ @ApiModelProperty("绾﹀畾鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate appointed;
+
+// @ValueTableShow(7)
+ @ApiModelProperty("妫�楠岀粨鏋�")
+ private Integer insResult;
+
+ /**
+ * 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璁㈠崟鍙�
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("OTC璁㈠崟鍙�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String otcCode;
+
+ @ValueTableShow(11)
+ @ApiModelProperty("涓嬪崟浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+ /**
+ *
*/
- private Date appointedTime;
+ @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("")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ *
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ private Integer userId;
+
+ private Integer mating;
+
+ @ApiModelProperty("妫�楠岀姸鎬�(0锛氬緟妫�楠� 1:妫�楠屼腑 2:宸叉楠� 3锛氬緟澶嶆牳 4锛氬鏍告湭閫氳繃 5锛氬鏍搁�氳繃)")
+ private Integer insState;
+
+ /**
+ * 妫�楠屽伐鍘�
+ */
+ private String factory;
/**
* 瀹為獙瀹ゅ悕绉�
*/
- private String laboratoryName;
+ private String laboratory;
/**
- * 鏍峰搧鍒嗙被
+ * 鏍峰搧绫诲瀷
*/
- private String sampleClassification;
-
- /**
- * 瑙勬牸鍨嬪彿
- */
- private String model;
+ private String sampleType;
/**
* 鏍峰搧鍚嶇О
*/
private String sample;
- /**
- * 鏍峰搧鏁伴噺
- */
- private Integer numberSamples;
-
- /**
- * 鏄惁鐣欐牱
- */
- private String leaveSample;
-
- /**
- * 鐣欐牱鏁伴噺
- */
- private Integer retainedSamples;
-
- /**
- * 鏍峰搧绫诲瀷
- */
- private String smapleType;
-
- /**
- * 濮旀墭鍏徃
- */
- private String entrustCompany;
-
- /**
- * 濮旀墭浜�
- */
- private String entrustName;
-
- /**
- * 鍒跺崟鏃堕棿
-
- */
- private Date documentTime;
-
- /**
- * 濮旀墭鏃堕棿
-
- */
- private Date entrustmentTime;
-
- /**
- * 妫�娴嬭繘搴�
-
- */
- private String inspectionProgress;
-
- /**
- * 妫�娴嬬粨鏋�
-
- */
- private String inspectionResult;
-
- /**
- *
- */
- private Integer createUser;
-
- /**
- *
- */
- private Date createTime;
-
- /**
- *
- */
- private Integer updateUser;
-
- /**
- *
- */
- private Date updateTime;
-
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3