From 6d240fbbf6a47b4125320f26c4f5c537e1493fb6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 十一月 2021 22:19:12 +0800
Subject: [PATCH] fix(bug修复): 到期合同的统计条件修改为只针对在职员工统计
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
index 5d138cf..79c56c7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
@@ -47,9 +47,13 @@
@TableField(exist = false)
private String empNumb="";
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @TableField(exist = false)
+ @ExcelField(value = "现部门(护卫点)")
+ private String allDeptName = "";
+
@FieldInfo(name = "newDeptName", type = "varchar", explain = "新部门")
@TableField("newDeptName")
- @ExcelField(value = "现部门(护卫点)")
private String newDeptName = "";
@FieldInfo(name = "newJobName", type = "varchar", explain = "新岗位")
@@ -124,7 +128,7 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
@FieldInfo(name = "jobId", explain = "现岗位Id")
@@ -166,9 +170,7 @@
@TableField(exist = false)
private String empStatus;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
--
Gitblit v1.8.0