From 0959cb1ed63fcf0bbb3beffc8d8f56ad204d6ddc Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 27 六月 2021 20:45:42 +0800
Subject: [PATCH] fix(bug修复): 增加了处理到期合同的定时任务
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
index e96d2fb..3a53a27 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
@@ -53,7 +53,11 @@
@TableField(exist = false)
@ExcelField(value = "部门(护卫点)")
private String allDeptName = "";
-
+
+ // @FieldInfo(name = "deptName", type = "bit", explain = "部门(护卫点)")
+ @TableField(exist = false)
+ private String deptName = "";
+
@TableField(exist = false)
@ExcelField(value = "岗位")
private String newJobName= "";
@@ -97,10 +101,7 @@
@FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
@TableField("dimissionType")
// @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
- private String dimissionType = "1";
-
-
-
+ private String dimissionType;
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -130,7 +131,7 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
@FieldInfo(name = "empIds", explain = "关闭档案人员Id")
--
Gitblit v1.8.0