From 2373057023decf149fa9a9850875a4f543f3d76d Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 26 二月 2021 14:31:44 +0800
Subject: [PATCH] fix(bug修复): 基本信息录入
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index ab0581a..2f5927c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -4,12 +4,15 @@
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 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;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_contractinfo")
+@Excel("员工合同信息")
public class EmpContractInfo implements Serializable {
private static final long serialVersionUID = 4152214737054224645L;
@@ -41,18 +45,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")
@@ -61,6 +74,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -69,6 +83,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
@@ -76,6 +91,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 = "结束日期")
@@ -83,18 +99,22 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "结束日期", writeConverter = TimeConverter.class)
private Date endDate;
@FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
@TableField("contractStatus")
+ @ExcelField(value = "合同状态", writeConverterExp = "1=有效,2=到期,3=续签,4=存档")
private String contractStatus = "";
@FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
@TableField("contractPeriod")
+ @ExcelField(value = "合同期限(年)")
private Integer contractPeriod = 0;
@FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
@TableField("transactor")
+ @ExcelField(value = "合同办理人")
private String transactor = "";
@FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
@@ -102,10 +122,12 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "合同签订日期", writeConverter = TimeConverter.class)
private Date signingDate;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
+ @ExcelField(value = "备注")
private String remark = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -139,4 +161,14 @@
@Version
private Integer version = 0;
+ @TableField(exist = false)
+ private String signingDateStr = "";
+
+ @TableField(exist = false)
+ private String endDateStr = "";
+
+ @FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
+ @TableField(exist = false)
+ private String contractStatusName = "";
+
}
\ No newline at end of file
--
Gitblit v1.8.0