From 09c6b3b6fc4ee6b1bc9fa1a6d3da3044729fc95a Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期二, 31 三月 2026 18:50:18 +0800
Subject: [PATCH] fix(hr): 修正年假计算逻辑及代码格式问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index 606ab46..a34898e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -15,10 +15,10 @@
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
+import cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
-import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -54,6 +54,7 @@
private final EmpContractInfoMapper empContractinfoMapper;
private final IRemoteDeptService remoteDeptService;
private final IEmpBaseInfoService empBaseInfoService;
+ private final EmpBaseInfoMapper empBaseInfoMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -183,7 +184,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void importEmpContractInfo(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) {
- for (List<Object> list : listObject) {
+ for (List<Object> list : listObject) {
if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
continue;
}
@@ -228,6 +229,11 @@
} catch (Exception e) {
returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
continue;
+ }
+
+ // 计算合同结束日期与当前日期之间的间隔天数
+ if (contractInfo.getEndDate() != null) {
+ contractInfo.setDiffDay((int) DateUtil.betweenDay(DateUtil.date(), contractInfo.getEndDate(), false));
}
if (StringUtils.isNotBlank(list.get(8).toString())) {
@@ -308,4 +314,16 @@
//设置不再提醒
empContractinfoMapper.updateEmpContractRemind(contractId);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void retireRehireEmpContract(EmpContractInfo empContractinfo) {
+ // 1.将原来合同状态为解除
+ empContractinfoMapper.terminateContract(Collections.singletonList(String.valueOf(empContractinfo.getEmpId())), operatorId);
+ // 2.创建一份新合同信息
+ empContractinfo.setDelFlag(0);
+ this.createEmpContractinfo(empContractinfo);
+ // 不再提醒
+ empBaseInfoMapper.updateRetirementReminded(empContractinfo.getEmpId().toString(), "1", operatorId);
+ }
}
--
Gitblit v1.8.0