From 311b2601947986502e27b78c452eb94d1aeffa6b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 三月 2021 23:42:01 +0800
Subject: [PATCH] fix(bug修复): 在职员工
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
index f6e250a..72948e2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
@@ -1,21 +1,24 @@
package cc.mrbird.febs.server.hr.entity;
-import java.io.Serializable;
-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;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* name:EmpWorkexperience
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_workExperience")
+@Excel("员工工作经历")
public class EmpWorkExperience implements Serializable {
@FieldInfo(name = "workExperienceId", type = "bigint", explain = "工作经历Id")
@@ -40,22 +44,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 = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb;
@FieldInfo(name = "sex", type = "varchar", explain = "性别码，使用国标性别性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex;
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -64,6 +73,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
@@ -72,10 +82,12 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "workUnit", type = "varchar", explain = "工作单位")
@TableField("workUnit")
+ @ExcelField(value = "工作单位")
private String workUnit;
@FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
@@ -83,6 +95,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "开始日期", writeConverter = TimeConverter.class)
private Date beginDate;
@FieldInfo(name = "endDate", type = "date", explain = "结束日期")
@@ -90,10 +103,12 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "结束日期", writeConverter = TimeConverter.class)
private Date endDate;
@FieldInfo(name = "jobContent", type = "varchar", explain = "主要工作内容")
@TableField("jobContent")
+ @ExcelField(value = "主要工作内容")
private String jobContent;
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -127,4 +142,4 @@
@Version
private Integer version;
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0