From ea1a4b7994b0d9710c47cbb54b7824a9f4bd72c9 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期五, 27 三月 2026 17:02:33 +0800
Subject: [PATCH] fix(EmpContractInfo): 修正导入合同信息的循环缩进并添加结束日期差值计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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 1ce8de2..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
@@ -12,12 +12,15 @@
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
+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.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -51,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");
@@ -118,6 +122,15 @@
if (empContractinfo.getBeginDate() == null) {
empContractinfo.setBeginDate(empContractinfo.getSigningDate());
}
+ if(StrUtil.isEmpty(empContractinfo.getSex())){
+ QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("empNumb", empContractinfo.getEmpNumb());
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getOne(queryWrapper);
+ if(ObjectUtil.isNotEmpty(empBaseInfo)){
+ empContractinfo.setSex(empBaseInfo.getSex());
+ }
+ }
+ empContractinfo.setDiffDay((int) DateUtil.betweenDay(DateUtil.date(), empContractinfo.getEndDate(), false));
empContractinfo.setCreator(operatorId);
empContractinfo.setModifier(operatorId);
this.save(empContractinfo);
@@ -132,6 +145,7 @@
empContractinfo.setDelFlag(dbData.getDelFlag());
empContractinfo.setModifyTime(new Date());
empContractinfo.setModifier(operatorId);
+ empContractinfo.setDiffDay((int) DateUtil.betweenDay(DateUtil.date(), empContractinfo.getEndDate(), false));
this.saveOrUpdate(empContractinfo);
}
@@ -170,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;
}
@@ -217,6 +231,11 @@
continue;
}
+ // 计算合同结束日期与当前日期之间的间隔天数
+ if (contractInfo.getEndDate() != null) {
+ contractInfo.setDiffDay((int) DateUtil.betweenDay(DateUtil.date(), contractInfo.getEndDate(), false));
+ }
+
if (StringUtils.isNotBlank(list.get(8).toString())) {
contractInfo.setContractPeriod(list.get(8).toString());
}
@@ -259,7 +278,7 @@
queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
queryWrapper.eq("a.remindFlag", 0);
queryWrapper.in("a.contractStatus", contractStatus);
- queryWrapper.between("a.diffDay", 0, diffDay);
+ queryWrapper.le("a.diffDay", diffDay);
queryWrapper.ge("a.endDate", DateUtil.formatDate(new Date()));
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
@@ -295,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