From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java | 136 ++++++++++++++++++++++-----------------------
1 files changed, 66 insertions(+), 70 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..bbaf1c4 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
@@ -1,90 +1,86 @@
package com.yuanchu.limslaboratory.pojo;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.io.Serializable;
/**
- * <p>
- *
- * </p>
+ * 鐢宠琛�(Inspection)琛ㄥ疄浣撶被
*
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
+ * @author zss
+ * @since 2023-08-03 13:04:05
*/
@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="Inspection瀵硅薄", description="")
+@Builder
+@TableName("inspection")
public class Inspection implements Serializable {
-
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鎶ユ缂栧彿")
- private String id;
+ /**
+ * 鐢宠鍗曠紪鍙�
+ **/
+ @TableId(type = IdType.AUTO)
+ private Integer id;
- @ApiModelProperty(value = "鎶ユ鐘舵�� 1锛氬凡妫�楠岋紱0鏈楠�")
+ /**
+ * 鐢宠鍗曠紪鐮�
+ **/
+ private String code;
+
+ /**
+ * 妫�楠岀被鍨� 0锛氬師鏉愭枡锛�1锛氫骇鍝侊紱2锛氬崐鎴愬搧锛�
+ **/
+ private Integer type;
+
+ /**
+ * 妫�楠岀姸鎬侊細1锛氬悎鏍硷紱0锛氫笉鍚堟牸
+ **/
private Integer inspectionStatus;
- @ApiModelProperty(value = "鏄惁鍚堟牸 1锛氭槸锛�0鍚�")
- private Integer qualifiedState;
-
- @ApiModelProperty(value = "1锛氬緟鎻愪氦锛�2锛氬凡鎻愪氦锛�0锛氬凡浣滃簾")
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
- @ApiModelProperty(value = "鎶ユ鏃堕棿")
- private LocalDateTime createTime;
-
- private LocalDateTime updateTime;
-
- private Integer version;
-
- @ApiModelProperty(value = "鎶ユ浜�")
- private String userName;
-
- @ApiModelProperty(value = "鍏宠仈 妫�楠屼汉锛堢敤鎴穒d锛�")
- private Integer inspectUserId;
-
- @ApiModelProperty(value = "妫�楠屽紑濮嬫棩鏈�")
- private LocalDateTime inspectStartTime;
-
- @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;
+ /**
+ * 鐧昏鏃ユ湡
+ **/
+ @TableField(fill = FieldFill.INSERT)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date updateTime;
+
+ /**
+ * 鍏宠仈 鐧昏浜猴紙鐢ㄦ埛id锛�
+ **/
+ private Integer userId;
+
+ /**
+ * 妫�楠屽紑濮嬫棩鏈�
+ **/
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
+
+ /**
+ * 妫�楠岀粨鏉熸棩鏈�
+ **/
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
}
+
--
Gitblit v1.9.3