Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-09 6d05ae432c4d76e521e031a76232a6dd1b0ff105

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

@@ -19,15 +19,18 @@
import org.springframework.transaction.annotation.Transactional;

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 cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
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.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import cn.hutool.core.date.DateUtil;
@@ -49,6 +52,7 @@

    private final RedisService redisService;
    private final EmpContractInfoMapper empContractinfoMapper;
    private final IRemoteDeptService remoteDeptService;
    private final IEmpBaseInfoService empBaseInfoService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
@@ -56,34 +60,38 @@

    @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("a.DeptName", 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());
            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("a.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);
        IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);
        List<EmpContractInfo> list = iPage.getRecords();
        //设置字典数据
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);