fix(hr): 修复保险提醒年龄范围判断逻辑

yubo

2026-03-27 0960e84f87af09990397cb38801bdfd40a2c2d36

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java

@@ -1,35 +1,40 @@
package cc.mrbird.febs.server.hr.service.impl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
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;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
import java.util.*;

/**
 * name:EmpContractinfo
@@ -47,40 +52,48 @@

    private final RedisService redisService;
    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) {
        LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
        QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
        if (StringUtils.isNotBlank(empContractinfo.getEmpNumb())) {
            queryWrapper.like(EmpContractInfo::getEmpNumb, empContractinfo.getEmpNumb());
            queryWrapper.like("a.EmpNumb", empContractinfo.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empContractinfo.getEmpName())) {
            queryWrapper.like(EmpContractInfo::getEmpName, empContractinfo.getEmpName());
            queryWrapper.like("a.EmpName", empContractinfo.getEmpName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getCertificateNumb())) {
            queryWrapper.like(EmpContractInfo::getCertificateNumb, empContractinfo.getCertificateNumb());
            queryWrapper.like("a.CertificateNumb", empContractinfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like(EmpContractInfo::getDeptName, empContractinfo.getDeptName());
            queryWrapper.like("b.allDeptName", empContractinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
            queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
            queryWrapper.between("a.SigningDate", empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
            queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
            queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like(EmpContractInfo::getEmpStatus, empContractinfo.getEmpStatus());
        }
        // if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
        //     queryWrapper.in("a.deptName", empContractinfo.getDeptName());
        // }
        if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
            queryWrapper.eq(EmpContractInfo::getContractStatus, empContractinfo.getContractStatus());
            queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
        }
        if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
            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());
        IPage<EmpContractInfo> iPage = this.page(page, queryWrapper);
        SortUtil.handlePageSort(request, page, "beginDate", FebsConstant.ORDER_ASC, true);
        IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);
        List<EmpContractInfo> list = iPage.getRecords();
        //设置字典数据
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
@@ -109,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);
@@ -123,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);
    }

@@ -160,34 +183,69 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
   public void importEmpContractInfo(List<List<Object>> listObject,List<String>  returnList) {
      for (List<Object> list : listObject) {
         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);
         Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
               .getDeptId();
         contractInfo.setDeptName(list.get(1).toString());
         contractInfo.setDeptId(deptId);
         contractInfo.setJobName(list.get(2).toString());
         contractInfo.setEmpName(list.get(3).toString());
         contractInfo.setCertificateNumb(list.get(4).toString());
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            contractInfo.setSigningDate(DateUtil.parseDate(list.get(5).toString()));
         }
         if (StringUtils.isNotBlank(list.get(6).toString())) {
            contractInfo.setEndDate(DateUtil.parseDate(list.get(6).toString()));
         }
         if (StringUtils.isNotBlank(list.get(7).toString())) {
            contractInfo.setContractPeriod(Integer.valueOf(list.get(7).toString()));
         }
         contractInfo.setContractStatus(list.get(8).toString());
         contractInfo.setTransactor(list.get(9).toString());
         contractInfo.setRemark(list.get(10).toString());
         this.save(contractInfo);
      }
   }
    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();
            }
            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()));
                continue;
            }
            Long empId = empBaseInfoService.getEmpIdByEmpNumb(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 {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    contractInfo.setSigningDate(DateUtil.parse(list.get(5).toString()));
                }
                if (StringUtils.isNotBlank(list.get(6).toString())) {
                    contractInfo.setBeginDate(DateUtil.parse(list.get(6).toString()));
                }

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

            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) {
                contractInfo.setContractStatus(dicItem.getDicItemCode());
            }

            contractInfo.setTransactor(list.get(10).toString());
            contractInfo.setRemark(list.get(11).toString());

            this.save(contractInfo);
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -196,4 +254,71 @@
        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());
        List<String> contractStatus = Lists.newArrayList("1","2");
        QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
        queryWrapper.eq("a.remindFlag", 0);
        queryWrapper.in("a.contractStatus", contractStatus);
        queryWrapper.le("a.diffDay", diffDay);
        queryWrapper.ge("a.endDate", DateUtil.formatDate(new Date()));

        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().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);
        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);
    }
}