From f4cfca6f2c8a5cb4e8e0fdc00d76a710283d6b06 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 12 四月 2024 18:05:48 +0800
Subject: [PATCH] 报告生成功能
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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 d50b2ff..d784a0a 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,9 +1,6 @@
package com.yuanchu.mom.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
@@ -21,6 +18,7 @@
* @TableName ins_order
*/
@Data
+@TableName("ins_order")
public class InsOrder extends OrderBy implements Serializable {
@ApiModelProperty(value = "涓婚敭")
@@ -32,7 +30,7 @@
*/
@ValueTableShow(2)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("濮旀墭缂栧彿")
+ @ApiModelProperty(value = "濮旀墭缂栧彿")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
@@ -57,7 +55,6 @@
/**
* 宸ュ巶鍩�
*/
- @ValueTableShow(5)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("宸ュ巶鍩�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -66,8 +63,8 @@
/**
* 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
*/
- @ValueTableShow(6)
- @ApiModelProperty("绱ф�ョ▼搴�")
+ @ValueTableShow(value = 6, name = "绱ф�ョ▼搴�")
+ @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
private Integer type;
/**
@@ -79,10 +76,14 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate appointed;
+// @ValueTableShow(7)
+ @ApiModelProperty("妫�楠岀粨鏋�")
+ private Integer insResult;
+
/**
* 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
*/
- @ApiModelProperty("妫�楠屽鐞�")
+ @ApiModelProperty("鐘舵��")
private Integer state;
/**
@@ -97,7 +98,6 @@
/**
* OTC璁㈠崟鍙�
*/
- @ValueTableShow(10)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("OTC璁㈠崟鍙�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -107,7 +107,6 @@
@ApiModelProperty("涓嬪崟浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
-
/**
*
*/
@@ -116,6 +115,12 @@
@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;
/**
*
@@ -127,10 +132,40 @@
/**
*
*/
- @ValueTableShow(13)
@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 laboratory;
+
+ /**
+ * 鏍峰搧绫诲瀷
+ */
+ private String sampleType;
+
+ /**
+ * 鏍峰搧鍚嶇О
+ */
+ private String sample;
+
+ @ApiModelProperty("妫�楠屾椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime insTime;
+
}
--
Gitblit v1.9.3