Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-04 cfce5a0402f09b7f7891f045a77b8a9ceea69e1f

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

@@ -6,6 +6,7 @@
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.mapper.EmpInsuranceMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
@@ -19,10 +20,12 @@
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
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.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
@@ -47,41 +50,42 @@
    private final RedisService redisService;
    private final EmpInsuranceMapper empInsuranceMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteDeptService remoteDeptService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser()).map(u -> u.getUserId().toString())
            .orElse("1");

    @Override
    public IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance) {
        LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpInsurance::getDelFlag, empInsurance.getDelFlag());
       QueryWrapper<EmpInsurance> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empInsurance.getDelFlag());
        if (StringUtils.isNotBlank(empInsurance.getEmpNumb())) {
            queryWrapper.like(EmpInsurance::getEmpNumb, empInsurance.getEmpNumb());
            queryWrapper.like("a.EmpNumb", empInsurance.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empInsurance.getEmpName())) {
            queryWrapper.like(EmpInsurance::getEmpName, empInsurance.getEmpName());
            queryWrapper.like("a.EmpName", empInsurance.getEmpName());
        }
        if (StringUtils.isNotBlank(empInsurance.getCertificateNumb())) {
            queryWrapper.like(EmpInsurance::getCertificateNumb, empInsurance.getCertificateNumb());
            queryWrapper.like("a.CertificateNumb", empInsurance.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empInsurance.getDeptName())) {
            queryWrapper.like(EmpInsurance::getDeptName, empInsurance.getDeptName());
            queryWrapper.like("a.DeptName", empInsurance.getDeptName());
        }
        if (StringUtils.isNotBlank(empInsurance.getApplayDateStr())) {
            queryWrapper.between(EmpInsurance::getApplayDate, empInsurance.getApplayDateStr().split(",")[0],
            queryWrapper.between("a.ApplayDate", empInsurance.getApplayDateStr().split(",")[0],
                    empInsurance.getApplayDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empInsurance.getInsuranceGaers())) {
            queryWrapper.eq(EmpInsurance::getInsuranceGaers, empInsurance.getInsuranceGaers());
            queryWrapper.eq("a.InsuranceGaers", empInsurance.getInsuranceGaers());
        }
        if (empInsurance.getReportStatus() != null && empInsurance.getReportStatus() != 0) {
            queryWrapper.eq(EmpInsurance::getReportStatus, empInsurance.getReportStatus());
            queryWrapper.eq("a.ReportStatus", empInsurance.getReportStatus());
        }
        if (StringUtils.isNotBlank(empInsurance.getEmpStatus())) {
            queryWrapper.eq(EmpInsurance::getEmpStatus, empInsurance.getEmpStatus());
            queryWrapper.eq("a.EmpStatus", empInsurance.getEmpStatus());
        }

        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        return empInsuranceMapper.selectPageVo(page, queryWrapper);
    }

    @Override