From 1a36e226f5091e2b36710e9cb771a4326ae3552b Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期三, 13 三月 2024 09:21:36 +0800
Subject: [PATCH] 检验下单
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 134 +++++++++++++++++++++++++-------------------
1 files changed, 77 insertions(+), 57 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..abf184d 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,12 +1,14 @@
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 java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -15,7 +17,7 @@
*/
@TableName(value ="ins_order")
@Data
-public class InsOrder implements Serializable {
+public class InsOrder extends OrderBy implements Serializable {
/**
*
*/
@@ -25,127 +27,145 @@
/**
* 濮旀墭缂栧彿
*/
+ @ValueTableShow(1)
+ @ApiModelProperty(value = "濮旀墭缂栧彿")
private String entrustCode;
/**
* 鏍峰搧缂栫爜
*/
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "鏍峰搧缂栫爜")
private String sampleCode;
/**
* 涓嬪崟瀹㈡埛
*/
- private String orderingCustomers;
+ @ValueTableShow(3)
+ @ApiModelProperty(value = "涓嬪崟瀹㈡埛")
+ private String custom;
/**
* 涓嬪崟鍗曚綅
*/
- private String orderingUnit;
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "涓嬪崟鍗曚綅")
+ private String company;
+
+ /**
+ * 宸ュ巶鍩�
+ */
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "宸ュ巶鍩�")
+ private String code;
/**
* 绱ф�ョ▼搴�
*/
- private String urgency;
+ @ValueTableShow(6)
+ @ApiModelProperty(value = "绱ф�ョ▼搴�")
+ private Integer type;
/**
* 绾﹀畾鏃堕棿
*/
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "绾﹀畾鏃堕棿")
private Date appointedTime;
/**
* 瀹為獙瀹ゅ悕绉�
*/
- private String laboratoryName;
+ @ValueTableShow(8)
+ @ApiModelProperty(value = "瀹為獙瀹ゅ悕绉�")
+ private String laboratory;
/**
- * 鏍峰搧鍒嗙被
+ * 鏍峰搧绫诲瀷
*/
- private String sampleClassification;
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "鏍峰搧绫诲瀷")
+ private String smapleType;
/**
* 瑙勬牸鍨嬪彿
*/
+ @ValueTableShow(10)
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
private String model;
/**
* 鏍峰搧鍚嶇О
*/
+ @ValueTableShow(11)
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
private String sample;
/**
* 鏍峰搧鏁伴噺
*/
- private Integer numberSamples;
+ @ValueTableShow(12)
+ @ApiModelProperty(value = "鏍峰搧鏁伴噺")
+ private Double sampleNum;
/**
* 鏄惁鐣欐牱
*/
- private String leaveSample;
+ @ValueTableShow(13)
+ @ApiModelProperty(value = "鏄惁鐣欐牱")
+ private Integer isLeave;
/**
* 鐣欐牱鏁伴噺
*/
- private Integer retainedSamples;
-
- /**
- * 鏍峰搧绫诲瀷
- */
- private String smapleType;
-
- /**
- * 濮旀墭鍏徃
- */
- private String entrustCompany;
-
- /**
- * 濮旀墭浜�
- */
- private String entrustName;
-
- /**
- * 鍒跺崟鏃堕棿
-
- */
- private Date documentTime;
-
- /**
- * 濮旀墭鏃堕棿
-
- */
- private Date entrustmentTime;
+ @ValueTableShow(14)
+ @ApiModelProperty(value = "鐣欐牱鏁伴噺")
+ private Integer leaveNum;
/**
* 妫�娴嬭繘搴�
-
*/
- private String inspectionProgress;
+ @ValueTableShow(15)
+ @ApiModelProperty(value = "妫�娴嬭繘搴�")
+ private String insProgress;
/**
- * 妫�娴嬬粨鏋�
-
+ * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
*/
- private String inspectionResult;
+ private Integer state;
/**
- *
+ * 澶囨敞
*/
+ private String remark;
+
+ /**
+ * OTC璁㈠崟鍙�
+ */
+ private String otcCode;
+
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT)
private Integer createUser;
-
/**
- *
+ *
*/
- private Date createTime;
-
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
/**
- *
+ *
*/
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
-
/**
- *
+ *
*/
- private Date updateTime;
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
}
\ No newline at end of file
--
Gitblit v1.9.3