From 17cbd5b9f612f3d29f02f2722357ea334ede2b41 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 31 七月 2025 19:17:43 +0800
Subject: [PATCH] 提交再次试验需要将检验项目的结论重置为null
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 13 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 537af85..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
@@ -28,13 +28,21 @@
/**
* 濮旀墭缂栧彿
*/
- @ValueTableShow(2)
+ @ValueTableShow(1)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@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")
@@ -43,22 +51,20 @@
/**
* 涓嬪崟瀹㈡埛
*/
- @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("濮旀墭鍗曚綅")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String company;
- @ValueTableShow(4)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("鑱旂郴鏂瑰紡")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -88,20 +94,17 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate appointed;
-// @ValueTableShow(7)
@ApiModelProperty("妫�楠岀粨鏋�")
private Integer insResult;
- @ValueTableShow(7)
@ApiModelProperty("鏍峰搧澶勭悊鏂瑰紡")
private Integer processing;
- @ValueTableShow(7)
@ApiModelProperty("鏄惁鐣欐牱")
private Integer isLeave;
/**
- * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
+ * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�4:宸叉楠�
*/
@ApiModelProperty("鐘舵��")
private Integer state;
@@ -109,7 +112,7 @@
/**
* 澶囨敞
*/
- @ValueTableShow(9)
+ @ValueTableShow(6)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("澶囨敞")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -123,7 +126,6 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String otcCode;
- @ValueTableShow(11)
@ApiModelProperty("涓嬪崟浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -191,13 +193,74 @@
@ValueTableShow(value = 14, name = "閫�鍥炵悊鐢�")
private String tell;
- @ValueTableShow(value = 15, name = "鎶ュ憡鍙戦�佹柟寮�")
private Integer send;
- @ValueTableShow(value = 16, name = "鏉ユ牱鏂瑰紡")
+ /**
+ * 璁㈠崟绫诲瀷(鏁版嵁瀛楀吀)
+ */
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