From 36fe021005dc0dfc99590f8d73eeca16f094ce79 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 06 六月 2024 22:33:45 +0800
Subject: [PATCH] fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 70b621b..b48fd74 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
@@ -79,10 +79,10 @@
@ExcelField(value = "合同结束日期", writeConverter = TimeConverter.class)
private Date endDate;
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限(年)")
@TableField("contractPeriod")
@ExcelField(value = "合同期限(年)")
- private Float contractPeriod = Float.valueOf(0);
+ private String contractPeriod;
@FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
@TableField(exist = false)
@@ -100,11 +100,10 @@
// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
-
-
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
+// @TableField("sex")
// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ @TableField("sex")
private String sex = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -138,7 +137,7 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
-// @ExcelField(value = "备注")
+ @ExcelField(value = "备注")
private String remark = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -169,8 +168,14 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
+
+ @TableField("diffDay")
+ private Integer diffDay = 0;
+
+ @TableField("remindFlag")
+ private Integer remindFlag = 0;
@TableField(exist = false)
private String signingDateStr = "";
@@ -178,7 +183,8 @@
@TableField(exist = false)
private String endDateStr = "";
-
+ @TableField(exist = false)
+ private String diffLabel = "";
--
Gitblit v1.8.0