From a5e88bf7cfb029f597a70b00bca50264125b2503 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期五, 15 三月 2024 18:04:34 +0800
Subject: [PATCH] 检验下单 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 116 ++++++++++++++++++----------------------------------------
1 files changed, 36 insertions(+), 80 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 44e35bb..d50b2ff 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,180 +1,136 @@
package com.yuanchu.mom.pojo;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-
-import java.io.Serializable;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
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.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
*/
@Data
-public class InsOrder implements Serializable {
+public class InsOrder extends OrderBy implements Serializable {
- /**
- *
- */
- @NotNull(message="[]涓嶈兘涓虹┖")
- @ApiModelProperty("")
+ @ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
private Integer id;
+
/**
* 濮旀墭缂栧彿
*/
+ @ValueTableShow(2)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("濮旀墭缂栧彿")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
- /**
- * 鏍峰搧缂栫爜
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鏍峰搧缂栫爜")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- 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;
+
/**
* 宸ュ巶鍩�
*/
+ @ValueTableShow(5)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("宸ュ巶鍩�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String code;
+
/**
* 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
*/
- @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
+ @ValueTableShow(6)
+ @ApiModelProperty("绱ф�ョ▼搴�")
private Integer type;
+
/**
* 绾﹀畾鏃堕棿
*/
+ @ValueTableShow(7)
@ApiModelProperty("绾﹀畾鏃堕棿")
- private Date appointed;
- /**
- * 瀹為獙瀹ゅ悕绉�
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("瀹為獙瀹ゅ悕绉�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String laboratory;
- /**
- * 鏍峰搧绫诲瀷
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鏍峰搧绫诲瀷")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String sampleType;
- /**
- * 瑙勬牸鍨嬪彿
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("瑙勬牸鍨嬪彿")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String model;
- /**
- * 鏍峰搧鍚嶇О
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鏍峰搧鍚嶇О")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String sample;
- /**
- * 鏍峰搧鏁伴噺
- */
- @ApiModelProperty("鏍峰搧鏁伴噺")
- private Double sampleNum;
- /**
- * 鏄惁鐣欐牱
- */
- @ApiModelProperty("鏄惁鐣欐牱")
- private Integer isLeave;
- /**
- * 鐣欐牱鏁伴噺
- */
- @ApiModelProperty("鐣欐牱鏁伴噺")
- private Integer leaveNum;
- /**
- * 妫�娴嬭繘搴�
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate appointed;
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("妫�娴嬭繘搴�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String insProgress;
/**
* 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
*/
- @ApiModelProperty("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璁㈠崟鍙�
*/
+ @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;
+
/**
*
*/
+ @ValueTableShow(12)
@ApiModelProperty("涓嬪崟鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+
/**
*
*/
+ @ValueTableShow(13)
@ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- /**
- * 澶栭敭锛氫笅鍗曞鎴� user琛╥d
- */
- @ApiModelProperty("澶栭敭锛氫笅鍗曞鎴� user琛╥d")
- private Integer userId;
}
--
Gitblit v1.9.3