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/InspectionItem.java | 96 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectionItem.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectionItem.java
index 0ed6e61..1d640c1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectionItem.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectionItem.java
@@ -1,81 +1,107 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
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 java.util.Date;
+import java.io.Serializable;
/**
- * <p>
+ * 鎴愬搧/杩囩▼妫�楠岄」鐩�(InspectionItem)琛ㄥ疄浣撶被
*
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-01
+ * @author zss
+ * @since 2023-09-06 13:34:17
*/
@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="InspectionItem瀵硅薄", description="")
-public class InspectionItem extends Model<InspectionItem> implements Serializable {
-
+@TableName("inspection_item")
+public class InspectionItem implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "涓婚敭")
- @TableId(value = "id", type = IdType.AUTO)
+ /**
+ * 涓婚敭
+ **/
+ @TableId(type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ /**
+ * 椤圭洰鍚嶇О
+ **/
private String name;
- @ApiModelProperty(value = "鐖跺悕绉�")
+ /**
+ * 鐖跺悕绉�
+ **/
private String father;
- @ApiModelProperty(value = "鍗曚綅")
+ /**
+ * 鍗曚綅
+ **/
private String unit;
- @ApiModelProperty(value = "鏍囧噯鍊�")
+ /**
+ * 鏍囧噯鍊�
+ **/
private String required;
- @ApiModelProperty(value = "鍐呮帶鍊�")
+ /**
+ * 鍐呮帶鍊�
+ **/
private String internal;
- @ApiModelProperty(value = "鎴愬搧妫�楠屽崟Id")
- private Integer finishInspectId;
-
- @ApiModelProperty(value = "妫�楠屽��")
+ /**
+ * 妫�楠屽��
+ **/
private String inspectionValue;
- @ApiModelProperty(value = "璇曢獙璁惧")
+ /**
+ * 璇曢獙璁惧Id 鍏宠仈
+ **/
private Integer deviceId;
- @ApiModelProperty(value = "缁撹")
+ /**
+ * 缁撹
+ **/
private Integer result;
- @ApiModelProperty(value = "妫�楠屼汉")
+ /**
+ * 妫�楠屽崟Id
+ **/
+ private Integer inspectId;
+
+ /**
+ * 妫�楠屼汉
+ **/
private String username;
- @TableField(fill = FieldFill.INSERT)
+ /**
+ * 绫诲瀷 1:杩囩▼;2:鎴愬搧
+ **/
+ private Integer type;
+
@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