From 02e13964dd95077c5f515156bc0da5187f5c8cf3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 19 六月 2024 11:49:37 +0800
Subject: [PATCH] 工时分组排序+制单人字段

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 7 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 9950112..94ff3c9 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,29 +28,39 @@
     /**
     * 濮旀墭缂栧彿
     */
-    @ValueTableShow(2)
+    @ValueTableShow(1)
     @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
     @ApiModelProperty(value = "濮旀墭缂栧彿")
     @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
     private String entrustCode;
 
+    @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)
+    @ValueTableShow(2)
     @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;
 
     /**
     * 宸ュ巶鍩�
@@ -76,9 +86,14 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate appointed;
 
-//    @ValueTableShow(7)
     @ApiModelProperty("妫�楠岀粨鏋�")
     private Integer insResult;
+
+    @ApiModelProperty("鏍峰搧澶勭悊鏂瑰紡")
+    private Integer processing;
+
+    @ApiModelProperty("鏄惁鐣欐牱")
+    private Integer isLeave;
 
     /**
     * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
@@ -89,7 +104,7 @@
     /**
     * 澶囨敞
     */
-    @ValueTableShow(9)
+    @ValueTableShow(6)
     @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
     @ApiModelProperty("澶囨敞")
     @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -171,4 +186,24 @@
     @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;
+
 }

--
Gitblit v1.9.3