fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题

luoyb

2024-06-06 36fe021005dc0dfc99590f8d73eeca16f094ce79

 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);
    }