From 75b7365399fd87efb8691c909aedb5503b03ccc8 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期三, 24 二月 2021 11:04:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
index 5f3336c..9e15844 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
@@ -4,6 +4,7 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
@@ -13,6 +14,8 @@
import java.math.BigDecimal;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,6 +34,7 @@
*/
@Data
@TableName("t_emp_leaveinfo")
+@Excel("员工请假记录")
public class EmpLeaveInfo implements Serializable {
private static final long serialVersionUID = -906183894054123470L;
@@ -44,22 +48,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -68,6 +77,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -76,6 +86,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "beginTime", type = "datetime", explain = "开始时间")
@@ -83,6 +94,7 @@
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(value = "开始时间", writeConverter = TimeConverter.class)
private Date beginTime;
@FieldInfo(name = "endTime", type = "datetime", explain = "结束时间")
@@ -90,18 +102,22 @@
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(value = "结束时间", writeConverter = TimeConverter.class)
private Date endTime;
@FieldInfo(name = "leaveType", type = "varchar", explain = "请假类型")
@TableField("leaveType")
+ @ExcelField(value = "请假类型", writeConverterExp = "1=事假,2=病假")
private String leaveType = "";
@FieldInfo(name = "leaveDay", type = "decimal", explain = "请假天数")
@TableField("leaveDay")
+ @ExcelField(value = "请假天数")
private BigDecimal leaveDay = BigDecimal.ZERO;
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
+ @ExcelField(value = "报备人")
private String reporter = "";
@FieldInfo(name = "returnDate", type = "date", explain = "到岗时间")
@@ -109,6 +125,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "到岗时间", writeConverter = TimeConverter.class)
private Date returnDate;
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
--
Gitblit v1.8.0