From 36fe021005dc0dfc99590f8d73eeca16f094ce79 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 06 六月 2024 22:33:45 +0800
Subject: [PATCH] fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 ae5cb11..5c87a70 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.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;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -118,6 +121,13 @@
if (empContractinfo.getBeginDate() == null) {
empContractinfo.setBeginDate(empContractinfo.getSigningDate());
}
+ if(StrUtil.isEmpty(empContractinfo.getSex())){
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getById(empContractinfo.getEmpId());
+ 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 +142,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);
}
@@ -218,7 +229,7 @@
}
if (StringUtils.isNotBlank(list.get(8).toString())) {
- contractInfo.setContractPeriod(Float.valueOf(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);
--
Gitblit v1.8.0