From 3adcc36797b576b6c6f793e0eeac41068b6dd717 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 14 一月 2025 11:26:00 +0800
Subject: [PATCH] 1.14调整
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 150 insertions(+), 20 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..e845c7a 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 = "涓婚敭")
@@ -30,34 +28,51 @@
/**
* 濮旀墭缂栧彿
*/
- @ValueTableShow(2)
+ @ValueTableShow(1)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("濮旀墭缂栧彿")
+ @ApiModelProperty(value = "濮旀墭缂栧彿")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
/**
+ * 澶栭儴濮旀墭缂栧彿
+ */
+ @ValueTableShow(2)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty(value = "澶栭儴濮旀墭缂栧彿")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String outEntrustCode;
+
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty(value = "妫�楠岀被鍒�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String orderType;
+
+ /**
* 涓嬪崟瀹㈡埛
*/
- @ValueTableShow(3)
+ @ValueTableShow(5)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("涓嬪崟瀹㈡埛")
+ @ApiModelProperty("鍒跺崟浜�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String custom;
/**
* 涓嬪崟鍗曚綅
*/
- @ValueTableShow(4)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("涓嬪崟鍗曚綅")
+ @ApiModelProperty("濮旀墭鍗曚綅")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String company;
+
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("鑱旂郴鏂瑰紡")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String phone;
/**
* 宸ュ巶鍩�
*/
- @ValueTableShow(5)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("宸ュ巶鍩�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -66,8 +81,8 @@
/**
* 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
*/
- @ValueTableShow(6)
- @ApiModelProperty("绱ф�ョ▼搴�")
+ @ValueTableShow(value = 6, name = "绱ф�ョ▼搴�")
+ @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
private Integer type;
/**
@@ -79,16 +94,25 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate appointed;
+ @ApiModelProperty("妫�楠岀粨鏋�")
+ private Integer insResult;
+
+ @ApiModelProperty("鏍峰搧澶勭悊鏂瑰紡")
+ private Integer processing;
+
+ @ApiModelProperty("鏄惁鐣欐牱")
+ private Integer isLeave;
+
/**
- * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
+ * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�4:宸叉楠�
*/
- @ApiModelProperty("妫�楠屽鐞�")
+ @ApiModelProperty("鐘舵��")
private Integer state;
/**
* 澶囨敞
*/
- @ValueTableShow(9)
+ @ValueTableShow(6)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("澶囨敞")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -97,17 +121,14 @@
/**
* OTC璁㈠崟鍙�
*/
- @ValueTableShow(10)
@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;
-
/**
*
*/
@@ -116,6 +137,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 +154,113 @@
/**
*
*/
- @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;
+
+ @ValueTableShow(value = 14, name = "閫�鍥炵悊鐢�")
+ private String tell;
+
+ private Integer send;
+
+ /**
+ * 璁㈠崟绫诲瀷(鏁版嵁瀛楀吀)
+ */
+ private String formType;
+
+ @ApiModelProperty("瀹℃牳鏃堕棿")
+ private LocalDateTime examineTime;
+
+ private String engineering;
+
+ private String engineeringEn;
+
+ private String production;
+
+ private String productionEn;
+
+ private Long companyId;
+
+ @ValueTableShow(value = 15, name = "濮旀墭浜�")
+ private String prepareUser;
+
+ @TableField(exist = false,select = false)
+ private Integer prepareUserId;
+
+ @ApiModelProperty("鏄惁瀹℃牳鎾ら攢")
+ private Integer isRevocation;
+
+ @ApiModelProperty("瀹℃牳鎾ら攢鐨勯」鐩甶d")
+ private String revocationInsProductIds;
+
+ @ApiModelProperty("閫氫俊:涓嬪彂鑷抽儴闂�,鍏宠仈鐨勯儴闂╥d")
+ private Integer departmentLimsId;
+
+ @ApiModelProperty("閫氫俊:涓嬪彂鑷抽儴闂�")
+ private String departmentLims;
+
+ @ApiModelProperty("閫氫俊:妫�娴嬩腑蹇冧富浠诲鏍镐汉")
+ private Integer checkState1User;
+ @ApiModelProperty("閫氫俊:妫�娴嬩腑蹇冧富浠诲鏍哥粨鏋�2:涓嶉�氳繃;1:閫氳繃")
+ private Integer checkState1;
+ @ApiModelProperty("閫氫俊:鐮斿彂閮ㄧ粡鐞嗗鏍镐汉")
+ private Integer checkState2User;
+ @ApiModelProperty("閫氫俊:鐮斿彂閮ㄧ粡鐞嗗鏍哥粨鏋�2:涓嶉�氳繃;1:閫氳繃")
+ private Integer checkState2;
+ @ApiModelProperty("閫氫俊:鎶�鏈礋璐ｄ汉瀹℃牳浜�")
+ private Integer checkState3User;
+ @ApiModelProperty("閫氫俊:鎶�鏈礋璐ｄ汉瀹℃牳缁撴灉2:涓嶉�氳繃;1:閫氳繃")
+ private Integer checkState3;
+
+ @ApiModelProperty("鏍锋満鍛�(闄や簡鍏朵粬鎴愬搧澶栬繖涓瓧娈靛繀閫�,鐢ㄤ簬浼佷笟寰俊鎺ㄩ��)")
+ private Integer issueUser;
+
+ @ApiModelProperty("闆朵欢鍙�(鍏朵粬鎴愬搧杩欎釜瀛楁闇�瑕佸～鍐欑殑淇℃伅)")
+ private String partNo;
+
+ /**
+ * 鏍锋満瀹屾垚鏃堕棿
+ */
+ @ValueTableShow(13)
+ @ApiModelProperty("鏍锋満瀹屾垚鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate issueTime;
+
+ @ApiModelProperty("鍒ゅ畾瑙勫垯:涓嶈�冭檻涓嶇‘瀹氬害/鑰冭檻涓嶇‘瀹氬害(%)")
+ private String rule;
+
+
}
--
Gitblit v1.9.3