yubo
2026-03-11 a889a01cca175ba5888f38be8f1df90089e6bb70
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);
    }
@@ -218,7 +232,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);
@@ -259,7 +273,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 +309,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);
    }
}