From 805248000274ad1bd010ec4a7ed6b2821be87d23 Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期四, 10 八月 2023 17:58:32 +0800
Subject: [PATCH] 8-10提交代码

---
 cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java |   87 ++++++++++++++++++-------------------------
 1 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java
index 5c81917..6c55a83 100644
--- a/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java
@@ -1,10 +1,15 @@
 package com.yuanchu.limslaboratory.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,87 +21,67 @@
  * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
  * @since 2023-08-10 11:50:11
  */
-@Getter
-@Setter
+@Data
 @TableName("cnas_annual_plan")
 public class CnasAnnualPlan implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 涓婚敭id
-     */
     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "涓婚敭id")
     private Integer id;
 
-    /**
-     * 鎬ц川,0:鍐呭,1:绠$悊璇勫
-     */
+    @ApiModelProperty(value = "鎬ц川,0:鍐呭,1:绠$悊璇勫")
     private Integer auditType;
 
-    /**
-     * 閮ㄩ棬
-     */
+    @ApiModelProperty(value = "閮ㄩ棬")
     private String department;
 
-    /**
-     * 瀹℃牳鐩殑
-     */
+    @ApiModelProperty(value = "瀹℃牳鐩殑")
     private String auditPurpose;
 
-    /**
-     * 瀹℃牳缁勯暱
-     */
+    @ApiModelProperty(value = "瀹℃牳缁勯暱")
     private String auditLeader;
 
-    /**
-     * 瀹℃牳缁勫憳
-     */
+    @ApiModelProperty(value = "瀹℃牳缁勫憳")
     private String auditEmp;
 
-    /**
-     * 瀹℃牳渚濇嵁
-     */
+    @ApiModelProperty(value = "瀹℃牳渚濇嵁")
     private String auditPursuant;
 
-    /**
-     * 瀹℃牳鑼冨洿
-     */
+    @ApiModelProperty(value = "瀹℃牳鑼冨洿")
     private String auditScope;
 
-    /**
-     * 缂栧埗浜哄憳
-     */
+    @ApiModelProperty(value = "缂栧埗浜哄憳")
     private String writeUser;
 
-    /**
-     * 褰曞叆浜哄憳
-     */
+    @ApiModelProperty(value = "褰曞叆浜哄憳")
     private String keyboarder;
 
-    /**
-     * 璁″垝鏃堕棿
-     */
-    private LocalDateTime planTime;
+    @ApiModelProperty(value = "璁″垝鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date planTime;
 
-    /**
-     * 涓嶅悎鏍奸」鐩暟
-     */
+    @ApiModelProperty(value = "涓嶅悎鏍奸」鐩暟")
     private Integer count;
 
-    /**
-     * 瀹℃牳鐘舵��,0:鍗冲皢寮�濮�,1:瀹屾垚,2:閫炬湡
-     */
+    @ApiModelProperty(value = "瀹℃牳鐘舵��,0:鍗冲皢寮�濮�,1:瀹屾垚,2:閫炬湡")
     private Integer auditState;
 
+    @TableLogic(value = "1", delval = "0")
+    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
     private Integer state;
 
-    /**
-     * 瀹℃牳鏃ユ湡
-     */
-    private LocalDateTime auditTime;
+    @ApiModelProperty(value = "瀹℃牳鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date auditTime;
 
-    private LocalDateTime createTime;
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "缂栧埗鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
 }

--
Gitblit v1.9.3