From a7a6a0c332f268010b4da0161cdee80acf9bc4ce Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 四月 2024 15:59:57 +0800
Subject: [PATCH] 2024-4-22 资源要求-人员明细-bug修改
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 223 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 132 insertions(+), 91 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 3bdd0e9..9950112 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,57 +1,153 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
/**
- * 妫�楠屼笅鍗�
- * @TableName ins_order
- */
-@TableName(value ="ins_order")
+* 妫�楠屼笅鍗�
+* @TableName ins_order
+*/
@Data
-public class InsOrder implements Serializable {
- /**
- *
- */
+@TableName("ins_order")
+public class InsOrder extends OrderBy implements Serializable {
+
+ @ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
private Integer id;
/**
- * 濮旀墭缂栧彿
- */
+ * 濮旀墭缂栧彿
+ */
+ @ValueTableShow(2)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty(value = "濮旀墭缂栧彿")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
/**
- * 鏍峰搧缂栫爜
- */
- private String sampleCode;
-
- /**
- * 涓嬪崟瀹㈡埛
- */
+ * 涓嬪崟瀹㈡埛
+ */
+ @ValueTableShow(3)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @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;
/**
- * 绱ф�ョ▼搴�
- */
+ * 宸ュ巶鍩�
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("宸ュ巶鍩�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String code;
+
+ /**
+ * 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
+ */
+ @ValueTableShow(value = 6, name = "绱ф�ョ▼搴�")
+ @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
private Integer type;
/**
- * 绾﹀畾鏃堕棿
+ * 绾﹀畾鏃堕棿
+ */
+ @ValueTableShow(7)
+ @ApiModelProperty("绾﹀畾鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate appointed;
+
+// @ValueTableShow(7)
+ @ApiModelProperty("妫�楠岀粨鏋�")
+ private Integer insResult;
+
+ /**
+ * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
+ */
+ @ApiModelProperty("鐘舵��")
+ private Integer state;
+
+ /**
+ * 澶囨敞
+ */
+ @ValueTableShow(9)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("澶囨敞")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String remark;
+
+ /**
+ * OTC璁㈠崟鍙�
+ */
+ @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;
+ /**
+ *
*/
- private Date appointedTime;
+ @ValueTableShow(12)
+ @ApiModelProperty("涓嬪崟鏃堕棿")
+ @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;
+
+ /**
+ *
+ */
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ /**
+ *
+ */
+ @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;
/**
* 瀹為獙瀹ゅ悕绉�
@@ -61,73 +157,18 @@
/**
* 鏍峰搧绫诲瀷
*/
- private String smapleType;
-
- /**
- * 瑙勬牸鍨嬪彿
- */
- private String model;
+ private String sampleType;
/**
* 鏍峰搧鍚嶇О
*/
private String sample;
- /**
- * 鏍峰搧鏁伴噺
- */
- private Double sampleNum;
-
- /**
- * 鏄惁鐣欐牱
- */
- private Integer isLeave;
-
- /**
- * 鐣欐牱鏁伴噺
- */
- private Integer leaveNum;
-
- /**
- * 妫�娴嬭繘搴�
-
- */
- private String insProgress;
-
- /**
- * 妫�娴嬬粨鏋�
-
- */
- private String insResult;
-
- /**
- * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
- */
- private Integer state;
-
- private String remark;
-
- @ApiModelProperty("")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
- /**
- *
- */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty("妫�楠屾椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
- /**
- *
- */
- @ApiModelProperty("")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
- /**
- *
- */
- @ApiModelProperty("淇敼鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
-}
\ No newline at end of file
+ private LocalDateTime insTime;
+
+ @ValueTableShow(value = 14, name = "閫�鍥炵悊鐢�")
+ private String tell;
+
+}
--
Gitblit v1.9.3