From 4e55bd9cee8e44f7a7a0d9185d8323fc7be9193d Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期六, 11 四月 2026 21:14:01 +0800
Subject: [PATCH] fix(hr): 修正员工基础信息字典字段的大小写问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 203 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 169 insertions(+), 34 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 f2f1fde..5ec4690 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;
@@ -50,13 +53,14 @@
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");
@Override
public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
- QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
if (StringUtils.isNotBlank(empContractinfo.getEmpNumb())) {
queryWrapper.like("a.EmpNumb", empContractinfo.getEmpNumb());
@@ -83,7 +87,7 @@
queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
}
if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empContractinfo.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empContractinfo.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -117,6 +121,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);
@@ -131,6 +144,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);
}
@@ -168,39 +182,39 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
- for (List<Object> list : listObject) {
- if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
+ public void importEmpContractInfo(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) {
+ for (List<Object> list : listObject) {
+ if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
continue;
}
- EmpContractInfo contractInfo = new EmpContractInfo();
- contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- contractInfo.setEmpNumb(list.get(0).toString());
- List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- if(null == depts){
- depts =remoteDeptService.setDeptRedis();
+ EmpContractInfo contractInfo = new EmpContractInfo();
+ contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ contractInfo.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
}
- if(null == depts){
- depts =remoteDeptService.setDeptRedis();
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
}
Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
if (null == dept) {
- returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
+ returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}部门不存在", listObject.indexOf(list) + 1, list.get(1).toString()));
continue;
}
Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
- if (null == empId){
- returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ if (null == empId) {
+ returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在", listObject.indexOf(list) + 1, list.get(0).toString()));
continue;
}
contractInfo.setDelFlag(0);
contractInfo.setEmpId(empId);
- contractInfo.setDeptName(list.get(1).toString());
- contractInfo.setDeptId(dept.getDeptId());
- contractInfo.setJobName(list.get(2).toString());
- contractInfo.setEmpName(list.get(3).toString());
- contractInfo.setCertificateNumb(list.get(4).toString());
- try {
+ contractInfo.setDeptName(list.get(1).toString());
+ contractInfo.setDeptId(dept.getDeptId());
+ contractInfo.setJobName(list.get(2).toString());
+ contractInfo.setEmpName(list.get(3).toString());
+ contractInfo.setCertificateNumb(list.get(4).toString());
+ try {
if (StringUtils.isNotBlank(list.get(5).toString())) {
contractInfo.setSigningDate(DateUtil.parse(list.get(5).toString()));
}
@@ -211,26 +225,31 @@
if (StringUtils.isNotBlank(list.get(7).toString())) {
contractInfo.setEndDate(DateUtil.parse(list.get(7).toString()));
}
- }catch (Exception e){
- returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ } catch (Exception e) {
+ returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
continue;
}
- if (StringUtils.isNotBlank(list.get(8).toString())) {
- contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
- }
+ // 计算合同结束日期与当前日期之间的间隔天数
+ 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());
+ }
//合同
- DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ DicItem dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "contractStatus") && StrUtil.equals(j.getDicItemName(), list.get(9).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
contractInfo.setContractStatus(dicItem.getDicItemCode());
}
- contractInfo.setTransactor(list.get(10).toString());
- contractInfo.setRemark(list.get(11).toString());
+ contractInfo.setTransactor(list.get(10).toString());
+ contractInfo.setRemark(list.get(11).toString());
- this.save(contractInfo);
- }
- }
+ this.save(contractInfo);
+ }
+ }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -239,4 +258,120 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empContractinfoMapper.terminateContract(list, operatorId);
}
+
+ @Override
+ public void autoStopContract(String operatorId) {
+ empContractinfoMapper.autoStopContract(operatorId);
+ }
+
+ @Override
+ public void updateContractRemindDay() {
+ empContractinfoMapper.updateContractRemindDay();
+ }
+
+ @Override
+ public IPage<EmpContractInfo> findRemindContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
+ int diffDay = Integer.parseInt(redisService.get("contract_remind").toString());
+ String rightDepts = remoteDeptService.userRightDepts();
+
+ /*
+ * 原逻辑：仅查询即将到期的合同
+ */
+ // QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
+ // queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
+ // queryWrapper.eq("a.remindFlag", 0);
+ // queryWrapper.in("a.contractStatus", Lists.newArrayList("1","2"));
+ // queryWrapper.in("a.empStatus", '0');
+ // queryWrapper.le("a.diffDay", diffDay);
+ // queryWrapper.ge("a.endDate", DateUtil.formatDate(new Date()));
+ // queryWrapper.in("c.dept_Id", rightDepts.split(StringConstant.COMMA));
+ // Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ // SortUtil.handlePageSort(request, page, "diffDay", FebsConstant.ORDER_ASC, true);
+ // IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);
+
+ /*
+ * 新逻辑：查询在职人员的最后一份合同
+ * 状态1或2：按原条件提醒（未到期、未提醒、在范围内）
+ * 状态4：已到期末，系统中无最新合同，直接提醒
+ */
+ // 处理部门ID，添加引号
+ String[] deptIds = rightDepts.split(StringConstant.COMMA);
+ StringBuilder quotedDepts = new StringBuilder();
+ for (int i = 0; i < deptIds.length; i++) {
+ if (i > 0) {
+ quotedDepts.append(",");
+ }
+ quotedDepts.append("'").append(deptIds[i]).append("'");
+ }
+
+ // 构建SQL：在职人员的最后一份合同
+ // 使用INNER JOIN替代子查询，提高性能
+ String today = DateUtil.formatDate(new Date());
+ StringBuilder sql = new StringBuilder();
+ sql.append("b.empStatus = '0'"); // 员工当前在职
+ sql.append(" AND a.DelFlag = ").append(empContractinfo.getDelFlag());
+ // 关联子查询获取每个人的最后一份合同
+ sql.append(" AND EXISTS (");
+ sql.append("SELECT 1 FROM (");
+ sql.append("SELECT empId, MAX(beginDate) as maxBeginDate ");
+ sql.append("FROM t_emp_contractinfo ");
+ sql.append("GROUP BY empId");
+ sql.append(") latest ");
+ sql.append("WHERE latest.empId = a.empId AND latest.maxBeginDate = a.beginDate");
+ sql.append(")");
+ // 合同状态判断
+ sql.append(" AND ((a.contractStatus IN ('1', '2')"); // 状态1或2
+ sql.append(" AND a.remindFlag = 0");
+ sql.append(" AND a.diffDay <= ").append(diffDay);
+ sql.append(" AND a.endDate >= '").append(today).append("'");
+ sql.append(") OR (a.contractStatus = '4'"); // 状态4
+ sql.append(" AND a.endDate < '").append(today).append("'");
+ sql.append("))");
+ sql.append(" AND c.dept_Id IN (").append(quotedDepts).append(")");
+
+ // 查询
+ Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<EmpContractInfo> iPage = empContractinfoMapper.selectLastContractPageVo(page, sql.toString());
+
+ List<EmpContractInfo> list = iPage.getRecords();
+ //设置字典数据
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setContractStatusName(dicItems.stream()
+ .filter(k -> DicCode.CONTRACTSTATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getContractStatus()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("新签"));
+ });
+ iPage.setRecords(list);
+ return iPage;
+ }
+
+ @Override
+ public void updateEmpContractRemind(EmpContractInfo empContractinfo) {
+ empContractinfoMapper.updateEmpContractRemind(empContractinfo.getContractId());
+ }
+
+ @Override
+ public void continueEmpContract(EmpContractInfo empContractinfo) {
+ Long contractId = empContractinfo.getContractId();
+ //创建一份新合同信息
+ empContractinfo.setDelFlag(0);
+ this.createEmpContractinfo(empContractinfo);
+
+ //设置不再提醒
+ 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