From 54a33a391e211a4b2b97621501c6236527d32331 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 01 八月 2024 10:41:00 +0800
Subject: [PATCH] 文件采集公式计算调整
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 32 +++++++++++++++++++-------------
1 files changed, 19 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..c57bf45 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,12 @@
/**
* 濮旀墭缂栧彿
*/
- @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")
@@ -43,22 +42,21 @@
/**
* 涓嬪崟瀹㈡埛
*/
- @ValueTableShow(3)
+ @ValueTableShow(5)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("濮旀墭瀹㈡埛")
+ @ApiModelProperty("鍒跺崟浜�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String custom;
/**
* 涓嬪崟鍗曚綅
*/
- @ValueTableShow(4)
+ @ValueTableShow(2)
@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,15 +86,12 @@
@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;
@@ -109,7 +104,7 @@
/**
* 澶囨敞
*/
- @ValueTableShow(9)
+ @ValueTableShow(6)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("澶囨敞")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -123,7 +118,7 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String otcCode;
- @ValueTableShow(11)
+// @ValueTableShow(11)
@ApiModelProperty("涓嬪崟浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -191,13 +186,24 @@
@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;
+
}
--
Gitblit v1.9.3