From edf8ce5a1a36560cefd532baf0cc7a4d38a5e199 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 21 Dec 2023 16:56:25 +0800
Subject: [PATCH] 请假修改
---
src/main/java/org/springblade/modules/leave/entity/Leave.java | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/leave/entity/Leave.java b/src/main/java/org/springblade/modules/leave/entity/Leave.java
index 4a0c6d0..5642676 100644
--- a/src/main/java/org/springblade/modules/leave/entity/Leave.java
+++ b/src/main/java/org/springblade/modules/leave/entity/Leave.java
@@ -1,42 +1,80 @@
package org.springblade.modules.leave.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springblade.core.mp.base.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
import java.util.Date;
@Data
@TableName("sys_leave")
-public class Leave extends BaseEntity {
+public class Leave implements Serializable {
+ private static final long serialVersionUID = 1L;
+ @TableId(
+ value = "id",
+ type = IdType.ASSIGN_ID
+ )
+ private String id;
+
+ @JsonSerialize(
+ using = ToStringSerializer.class
+ )
+ @ApiModelProperty("创建人")
+ private Long createUser;
+ @JsonSerialize(
+ using = ToStringSerializer.class
+ )
+ @ApiModelProperty("创建部门")
+ private Long createDept;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8"
+ )
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+ @JsonSerialize(
+ using = ToStringSerializer.class
+ )
+ @ApiModelProperty("更新人")
+ private Long updateUser;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8"
+ )
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
+ @ApiModelProperty("业务状态")
+ private Integer status;
+ @TableLogic
+ @ApiModelProperty("是否已删除")
+ private Integer isDeleted;
//请假原因
private String reason;
- @DateTimeFormat(
- pattern = "yyyy-MM-dd HH:mm:ss"
- )
- @JsonFormat(
- pattern = "yyyy-MM-dd HH:mm:ss"
- )
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
- @DateTimeFormat(
- pattern = "yyyy-MM-dd HH:mm:ss"
- )
- @JsonFormat(
- pattern = "yyyy-MM-dd HH:mm:ss"
- )
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
- @DateTimeFormat(
- pattern = "yyyy-MM-dd HH:mm:ss"
- )
- @JsonFormat(
- pattern = "yyyy-MM-dd HH:mm:ss"
- )
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
private String urls;
--
Gitblit v1.9.3