From 0d98e9c2d06c5d8b7b6de5ec433a12713744ae6b Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 18 三月 2024 01:04:38 +0800
Subject: [PATCH] 功能大调整

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java |   48 +++++++++++++++++++++++-------------------------
 1 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
index bf057a2..eb0aced 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
@@ -1,14 +1,15 @@
 package com.yuanchu.mom.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 妫�楠屾牱鍝�
@@ -85,9 +86,8 @@
 
     /**
      * 妫�娴嬭繘搴�
-
      */
-    private String insProgress;
+    private Integer insProgress;
 
     /**
      * 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
@@ -97,7 +97,9 @@
     /**
      * 涓嬪彂鏃堕棿
      */
-    private Date sendTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime sendTime;
 
     /**
      * 閰嶅鏍峰搧鏁伴噺
@@ -112,26 +114,22 @@
     /**
      * 绾﹀畾鏃堕棿
      */
-    private Date appointed;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate appointed;
 
-    /**
-     * 
-     */
+    @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    /**
-     * 
-     */
-    private Integer updateUser;
-
-    /**
-     * 
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    /**
-     * 
-     */
-    private Date updateTime;
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    @ApiModelProperty("淇敼鏃堕棿")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
 }
\ No newline at end of file

--
Gitblit v1.9.3