From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/FinishedInspect.java | 111 ++++++++++++++++++++++++++++---------------------------
1 files changed, 57 insertions(+), 54 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/FinishedInspect.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/FinishedInspect.java
index fd3be29..1373879 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/FinishedInspect.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/FinishedInspect.java
@@ -1,102 +1,105 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
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;
+import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.io.Serializable;
/**
- * <p>
+ * 鎴愬搧妫�楠�(FinishedInspect)琛ㄥ疄浣撶被
*
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-01
+ * @author zss
+ * @since 2023-09-06 13:33:56
*/
@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="FinishedInspect瀵硅薄", description="")
+@TableName("finished_inspect")
public class FinishedInspect implements Serializable {
-
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "涓婚敭", hidden = true)
- @TableId(value = "id", type = IdType.AUTO)
+ /**
+ * 涓婚敭
+ **/
+ @TableId(type = IdType.AUTO)
private Integer id;
- @NotBlank(message = "璁㈠崟鍙蜂笉鍏佽涓虹┖锛�")
- @ApiModelProperty(value = "璁㈠崟鍙�", required = true, example = "DDH202308010001")
+ /**
+ * 璁㈠崟鍙�
+ **/
private String orderNumber;
- @NotBlank(message = "瀹㈡埛鍚嶇О涓嶅厑璁镐负绌猴紒")
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О", required = true, example = "鎳掓磱娲�")
+ /**
+ * 瀹㈡埛鍚嶇О
+ **/
private String customerName;
- @NotBlank(message = "宸ョ▼鍚嶇О涓嶅厑璁镐负绌猴紒")
- @ApiModelProperty(value = "宸ョ▼鍚嶇О", required = true, example = "娑蹭綋纭呮鑳�")
+ /**
+ * 宸ョ▼鍚嶇О
+ **/
private String projectName;
- @NotBlank(message = "璐ㄩ噺杩芥函鍙蜂笉鍏佽涓虹┖锛�")
- @ApiModelProperty(value = "璐ㄩ噺杩芥函鍙�", required = true, example = "ZLZSH202308010001")
+ /**
+ * 璐ㄩ噺杩芥函鍙�
+ **/
private String qualityTraceability;
- @ApiModelProperty(value = "0:鎴愬搧;1锛氳繃绋�;", hidden = true)
- private Integer type;
-
- @NotBlank(message = "鍗曚綅涓嶅厑璁镐负绌猴紒")
- @ApiModelProperty(value = "鍗曚綅", required = true, example = "鍚�")
+ /**
+ * 鍗曚綅
+ **/
private String unit;
- @NotNull(message = "璇疯緭鍏ユ暟閲忥紒")
- @ApiModelProperty(value = "鏁伴噺", required = true, example = "50")
+ /**
+ * 鏁伴噺
+ **/
private Integer quantity;
- @NotNull(message = "璇烽�夋嫨瑙勬牸鍨嬪彿锛�")
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿鎷兼帴瀛楃", required = true, example = "8.7/15kV JLS-3.2")
+ /**
+ * 瑙勬牸鍨嬪彿
+ **/
private String specificationsModel;
- @NotNull(message = "璇烽�夋嫨鍨嬪彿ID锛�")
- @TableField(exist = false)
- @ApiModelProperty(value = "鍨嬪彿ID", required = true, example = "1")
- private Integer specificationsId;
-
- @ApiModelProperty(value = "椤圭洰缂栫爜", required = true, example = "GX20230807")
- private String materialCode;
-
- @NotNull(message = "璇烽�夋嫨椤圭洰鍚嶇О锛�")
- @ApiModelProperty(value = "椤圭洰鍚嶇О", required = true, example = "鍏夌氦")
+ /**
+ * 鐗╂枡鍚嶇О
+ **/
private String material;
- @NotNull(message = "璇烽�夋嫨涓绘満宸ワ紒")
- @ApiModelProperty(value = "涓绘満宸�:鐢ㄦ埛id", required = true, example = "1")
+ /**
+ * 鐗╂枡缂栫爜
+ **/
+ private String materialCode;
+
+ /**
+ * 鎶ユ浜�:鐢ㄦ埛id
+ **/
private Integer userId;
- @ApiModelProperty(value = "妫�楠岀粨璁�", hidden = true, required = true, example = "DDH202308010001")
+ /**
+ * 妫�楠岀粨璁�;0:涓嶅悎鏍�;1:鍚堟牸
+ **/
private Integer result;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
- @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
- @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
-
-
}
+
--
Gitblit v1.9.3