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'
---
cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java | 90 ++++++++++++++++++--------------------------
1 files changed, 37 insertions(+), 53 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..b89903d 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,16 @@
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.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -16,87 +22,65 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-08-10 11:50:11
*/
-@Getter
-@Setter
+@Data
@TableName("cnas_annual_plan")
+@ApiModel(value="CnasAnnualPlan瀵硅薄", description="")
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:閫炬湡
- */
- private Integer auditState;
-
+ @TableLogic(value = "1", delval = "0")
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=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