From d7b6f020d3b6cce69f19f5198da95513c5d57b32 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 23 九月 2025 21:53:14 +0800
Subject: [PATCH] 1.系统管理中系统参数增加了将配置项写入缓存的功能 2.系统管理启动时将配置项写入缓存 3.员工基本信息增加了年假字段 4.员工基本信息服务增加了计算年假的功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index 44be67a..e8c0388 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.entity;
import java.io.Serializable;
+import java.time.LocalDate;
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
@@ -188,7 +189,7 @@
@FieldInfo(name = "seniority", type = "tinyint", explain = "入司工龄")
@TableField("seniority")
@ExcelField(value = "入司工龄")
- private Integer seniority = 0;
+ private String seniority = "0年0月";
@FieldInfo(name = "nativePlace", type = "varchar", explain = "籍贯")
@TableField("nativePlace")
@@ -252,9 +253,9 @@
@TableField("InsuranceType")
private String insuranceType = "";
- @FieldInfo(name = "insuranceTypeName", type = "varchar", explain = "保险类型")
+ @FieldInfo(name = "insuranceTypeName", type = "varchar", explain = "社保档位")
@TableField(exist = false)
- @ExcelField(value = "保险类型")
+ @ExcelField(value = "社保档位")
private String insuranceTypeName = "";
@FieldInfo(name = "socialNumb", type = "varchar", explain = "社保电脑号")
@@ -296,7 +297,7 @@
@TableField("certificateList")
private String certificateList = "";
- //@FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
+ @FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
@TableField(exist = false)
@ExcelField(value = "相关证件", writeConverterExp = "1=高中毕业证,2=专科毕业证,3=本科毕业证")
private String certificateListName = "";
@@ -313,7 +314,7 @@
@FieldInfo(name = "entryType", type = "varchar", explain = "入职类型")
@TableField("entryType")
- private String entryType = "";
+ private String entryType;
@FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
@TableField(exist = false)
@@ -347,7 +348,7 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
@FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
@@ -388,9 +389,9 @@
@TableField(exist = false)
private String contractStatus = "";
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限(年)")
@TableField(exist = false)
- private Integer contractPeriod = 0;
+ private String contractPeriod;
@FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
@TableField(exist = false)
@@ -431,7 +432,7 @@
@TableField("allDeptName")
private String allDeptName = "";
- // @FieldInfo(name = "dimissRemark", type = "varchar", explain = "离职备注")
- // @TableField("dimissRemark")
- // private String dimissRemark = "";
+ @FieldInfo(name = "annualLeave", type = "int", explain = "年假天数")
+ @TableField("annualLeave")
+ private Integer annualLeave = 0;
}
--
Gitblit v1.8.0