From 08996b11833ab99f2553c2e4f1dc960e999a0d3c Mon Sep 17 00:00:00 2001 From: gaoaoy <1042166043@qq.com> Date: 星期四, 14 三月 2024 11:38:35 +0800 Subject: [PATCH] 检验下单 功能调整 --- inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 75 ++++++++++--------------------------- 1 files changed, 20 insertions(+), 55 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 0b20821..2ec16fe 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 @@ -8,6 +8,7 @@ import lombok.Data; import java.io.Serializable; +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -43,123 +44,85 @@ */ @ValueTableShow(3) @ApiModelProperty(value = "鏍峰搧绫诲瀷") - private String smapleType; + private String sampleType; - /** - * 鏍峰搧鍚嶇О - */ - @ValueTableShow(4) - @ApiModelProperty(value = "鏍峰搧鍚嶇О") - private String sample; - - /** - * 濮旀墭鍏徃 - */ - @ValueTableShow(5) - @ApiModelProperty(value = "濮旀墭鍏徃") - private String entrustCompany; - - /** - * 濮旀墭浜� - */ - @ValueTableShow(6) - @ApiModelProperty(value = "濮旀墭浜�") - private String client; - - /** - * 鍒跺崟鏃堕棿 - */ - @ValueTableShow(7) - @ApiModelProperty("鍒跺崟鏃堕棿") - @TableField(fill = FieldFill.INSERT) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime documentPreparation; - - /** - * 濮旀墭鏃堕棿 - */ - @ValueTableShow(8) - @ApiModelProperty("濮旀墭鏃堕棿") - @TableField(fill = FieldFill.INSERT) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime entrustmentTime; /** * 鏍峰搧鏁伴噺 */ - @ValueTableShow(9) + @ValueTableShow(4) @ApiModelProperty(value = "鏍峰搧鏁伴噺") - private Double sampleNum; + private Integer sampleNum; /** * 绱ф�ョ▼搴� */ - @ValueTableShow(10) + @ValueTableShow(5) @ApiModelProperty(value = "绱ф�ョ▼搴�") private Integer type; /** * 绾﹀畾鏃堕棿 */ - @ValueTableShow(11) + @ValueTableShow(6) @ApiModelProperty(value = "绾﹀畾鏃堕棿") @TableField(fill = FieldFill.INSERT) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime appointedTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate appointed; /** * 妫�娴嬭繘搴� */ - @ValueTableShow(12) + @ValueTableShow(7) @ApiModelProperty(value = "妫�娴嬭繘搴�") private String insProgress; /** - * 妫�娴嬬粨鏋� - */ - @ValueTableShow(13) - @ApiModelProperty(value = "妫�娴嬬粨鏋�") - private String detectionResult; - - /** * 涓嬪崟瀹㈡埛 */ + @ValueTableShow(8) @ApiModelProperty(value = "涓嬪崟瀹㈡埛") private String custom; /** * 涓嬪崟鍗曚綅 */ + @ValueTableShow(9) @ApiModelProperty(value = "涓嬪崟鍗曚綅") private String company; /** * 宸ュ巶鍩� */ + @ValueTableShow(10) @ApiModelProperty(value = "宸ュ巶鍩�") private String code; /** * 瀹為獙瀹ゅ悕绉� */ + @ValueTableShow(11) @ApiModelProperty(value = "瀹為獙瀹ゅ悕绉�") private String laboratory; /** * 瑙勬牸鍨嬪彿 */ + @ValueTableShow(12) @ApiModelProperty(value = "瑙勬牸鍨嬪彿") private String model; /** * 鏄惁鐣欐牱 */ + @ValueTableShow(13) @ApiModelProperty(value = "鏄惁鐣欐牱") private Integer isLeave; /** * 鐣欐牱鏁伴噺 */ + @ValueTableShow(14) @ApiModelProperty(value = "鐣欐牱鏁伴噺") private Integer leaveNum; @@ -178,7 +141,7 @@ */ private String otcCode; - @ApiModelProperty("") + @ApiModelProperty("鍒涘缓浜�") @TableField(fill = FieldFill.INSERT) private Integer createUser; /** @@ -191,7 +154,7 @@ /** * */ - @ApiModelProperty("") + @ApiModelProperty("淇敼浜�") @TableField(fill = FieldFill.INSERT_UPDATE) private Integer updateUser; /** @@ -202,4 +165,6 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + private Integer userId; + } \ No newline at end of file -- Gitblit v1.9.3