From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/leave/entity/Leave.java | 107 ++++++++++++++++++++++++++++-------------------------
1 files changed, 57 insertions(+), 50 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 136ae46..5642676 100644
--- a/src/main/java/org/springblade/modules/leave/entity/Leave.java
+++ b/src/main/java/org/springblade/modules/leave/entity/Leave.java
@@ -2,83 +2,90 @@
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;
-/**
- * 请假实体类
- *
- * @author zhongrj
- * @since 2020-02-28
- */
@Data
@TableName("sys_leave")
-public class Leave implements Serializable {
-
+public class Leave implements Serializable {
private static final long serialVersionUID = 1L;
+ @TableId(
+ value = "id",
+ type = IdType.ASSIGN_ID
+ )
+ private String id;
- /**
- * 主键id
- */
- @TableId(value = "id",type = IdType.AUTO)
- private Long 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;
- /**
- * 用户id
- */
- private Long userId;
+ //请假原因
+ private String reason;
- /**
- * 请假类型
- */
- private Integer leaveType;
-
- /**
- * 请假原因
- */
- private String leaveReason;
-
- /**
- * 请假开始时间
- */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
- /**
- * 请假截止时间
- */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
- /**
- * 创建时间
- */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ private Date auditTime;
- /**
- * 审核状态 1：通过 2：不通过 3：待审核
- */
- private Integer auditStatus;
+ private String urls;
- /**
- * 审核明细
- */
+ //审核状态（1、通过；2不通过；10待审核）
+ private String auditStatus;
+
+ //审核明细
private String auditDetail;
- /**
- * 审核时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date auditTime;
+ //审核人
+ private String auditUser;
}
--
Gitblit v1.9.3