From 1faae0508c2f55b25fdacad9eb18d00cc5aa86ef Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 20 七月 2023 16:58:03 +0800
Subject: [PATCH] 提交删除申请,编辑样品
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java | 69 +++++++++++++++-------------------
1 files changed, 31 insertions(+), 38 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
index 841eb00..5c1f45f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
@@ -2,20 +2,32 @@
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
/**
* <p>
- *
+ *
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="Inspection瀵硅薄", description="")
public class Inspection implements Serializable {
@@ -24,6 +36,9 @@
@ApiModelProperty(value = "鎶ユ缂栧彿")
private String id;
+
+ @ApiModelProperty(value = "鎶ユ绫诲瀷")
+ private Integer type;
@ApiModelProperty(value = "鎶ユ鐘舵�� 1锛氬凡妫�楠岋紱0鏈楠�")
private Integer inspectionStatus;
@@ -34,10 +49,15 @@
@ApiModelProperty(value = "1锛氬緟鎻愪氦锛�2锛氬凡鎻愪氦锛�0锛氬凡浣滃簾")
private Integer state;
- @ApiModelProperty(value = "鎶ユ鏃堕棿")
- private LocalDateTime createTime;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
- private LocalDateTime updateTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
private Integer version;
@@ -53,38 +73,11 @@
@ApiModelProperty(value = "妫�楠岀粨鏉熸棩鏈�")
private LocalDateTime inspectEndTime;
- @ApiModelProperty(value = "鎶ユ鏁伴噺-鐗╂枡鏁伴噺")
- private Integer materialNum;
-
- @ApiModelProperty(value = "渚涘簲鍟�")
- private String materialSupplier;
-
- @ApiModelProperty(value = "鐗╂枡鍚嶇О")
- private String materialName;
-
- @ApiModelProperty(value = "鐗╂枡瀛樻斁鍦�")
- private String materialLocation;
-
- @ApiModelProperty(value = "鐗╂枡鎵规")
- private String materialBatch;
-
- @ApiModelProperty(value = "鐗╂枡鐩樺彿")
- private String materialReelNumber;
-
- @ApiModelProperty(value = "瑙勬牸鍚嶇О/鍨嬪彿鍚嶇О")
- private String specificationsSerialNumber;
-
- @ApiModelProperty(value = "鐢靛帇绛夌骇")
- private String specificationsVoltageLevel;
-
- @ApiModelProperty(value = "涓荤嚎蹇冩埅闈�")
- private String specificationsCrossSection;
-
- @ApiModelProperty(value = "涓荤嚎鑺姱鏁�")
- private String specificationsNumberOfCores;
-
- @ApiModelProperty(value = "鐢熶骇鎸囦护鍙�")
- private String specificationsInstruct;
-
-
+ public Inspection(Integer type, Integer inspectionStatus, Integer state, Integer version, String userName) {
+ this.type = type;
+ this.inspectionStatus = inspectionStatus;
+ this.state = state;
+ this.version = version;
+ this.userName = userName;
+ }
}
--
Gitblit v1.9.3