From 42cbf4dbc2a47e976ca78af7d7a2a8773b29acb8 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期三, 13 三月 2024 10:06:55 +0800
Subject: [PATCH] 检验下单 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 128 +++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 47 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 abf184d..0b20821 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
@@ -9,17 +9,17 @@
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.util.Date;
/**
* 妫�楠屼笅鍗�
+ *
* @TableName ins_order
*/
-@TableName(value ="ins_order")
+@TableName(value = "ins_order")
@Data
public class InsOrder extends OrderBy implements Serializable {
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Integer id;
@@ -39,95 +39,129 @@
private String sampleCode;
/**
- * 涓嬪崟瀹㈡埛
+ * 鏍峰搧绫诲瀷
*/
@ValueTableShow(3)
- @ApiModelProperty(value = "涓嬪崟瀹㈡埛")
- private String custom;
+ @ApiModelProperty(value = "鏍峰搧绫诲瀷")
+ private String smapleType;
/**
- * 涓嬪崟鍗曚綅
+ * 鏍峰搧鍚嶇О
*/
@ValueTableShow(4)
- @ApiModelProperty(value = "涓嬪崟鍗曚綅")
- private String company;
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ private String sample;
/**
- * 宸ュ巶鍩�
+ * 濮旀墭鍏徃
*/
@ValueTableShow(5)
- @ApiModelProperty(value = "宸ュ巶鍩�")
- private String code;
+ @ApiModelProperty(value = "濮旀墭鍏徃")
+ private String entrustCompany;
+
+ /**
+ * 濮旀墭浜�
+ */
+ @ValueTableShow(6)
+ @ApiModelProperty(value = "濮旀墭浜�")
+ private String client;
+
+ /**
+ * 鍒跺崟鏃堕棿
+ */
+ @ValueTableShow(7)
+ @ApiModelProperty("鍒跺崟鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime documentPreparation;
+
+ /**
+ * 濮旀墭鏃堕棿
+ */
+ @ValueTableShow(8)
+ @ApiModelProperty("濮旀墭鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime entrustmentTime;
+
+ /**
+ * 鏍峰搧鏁伴噺
+ */
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "鏍峰搧鏁伴噺")
+ private Double sampleNum;
/**
* 绱ф�ョ▼搴�
*/
- @ValueTableShow(6)
+ @ValueTableShow(10)
@ApiModelProperty(value = "绱ф�ョ▼搴�")
private Integer type;
/**
* 绾﹀畾鏃堕棿
*/
- @ValueTableShow(7)
+ @ValueTableShow(11)
@ApiModelProperty(value = "绾﹀畾鏃堕棿")
- private Date appointedTime;
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime appointedTime;
+
+ /**
+ * 妫�娴嬭繘搴�
+ */
+ @ValueTableShow(12)
+ @ApiModelProperty(value = "妫�娴嬭繘搴�")
+ private String insProgress;
+
+ /**
+ * 妫�娴嬬粨鏋�
+ */
+ @ValueTableShow(13)
+ @ApiModelProperty(value = "妫�娴嬬粨鏋�")
+ private String detectionResult;
+
+ /**
+ * 涓嬪崟瀹㈡埛
+ */
+ @ApiModelProperty(value = "涓嬪崟瀹㈡埛")
+ private String custom;
+
+ /**
+ * 涓嬪崟鍗曚綅
+ */
+ @ApiModelProperty(value = "涓嬪崟鍗曚綅")
+ private String company;
+
+ /**
+ * 宸ュ巶鍩�
+ */
+ @ApiModelProperty(value = "宸ュ巶鍩�")
+ private String code;
/**
* 瀹為獙瀹ゅ悕绉�
*/
- @ValueTableShow(8)
@ApiModelProperty(value = "瀹為獙瀹ゅ悕绉�")
private String laboratory;
/**
- * 鏍峰搧绫诲瀷
- */
- @ValueTableShow(9)
- @ApiModelProperty(value = "鏍峰搧绫诲瀷")
- private String smapleType;
-
- /**
* 瑙勬牸鍨嬪彿
*/
- @ValueTableShow(10)
@ApiModelProperty(value = "瑙勬牸鍨嬪彿")
private String model;
/**
- * 鏍峰搧鍚嶇О
- */
- @ValueTableShow(11)
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
- private String sample;
-
- /**
- * 鏍峰搧鏁伴噺
- */
- @ValueTableShow(12)
- @ApiModelProperty(value = "鏍峰搧鏁伴噺")
- private Double sampleNum;
-
- /**
* 鏄惁鐣欐牱
*/
- @ValueTableShow(13)
@ApiModelProperty(value = "鏄惁鐣欐牱")
private Integer isLeave;
/**
* 鐣欐牱鏁伴噺
*/
- @ValueTableShow(14)
@ApiModelProperty(value = "鐣欐牱鏁伴噺")
private Integer leaveNum;
-
- /**
- * 妫�娴嬭繘搴�
- */
- @ValueTableShow(15)
- @ApiModelProperty(value = "妫�娴嬭繘搴�")
- private String insProgress;
/**
* 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
--
Gitblit v1.9.3