fix(bug修复): 用户部门显示allDeptName

luoyb

2021-03-16 1703c96b6833244340dc10bf746d8c08a331008c

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

@@ -1,11 +1,15 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.constant.MyConstant;
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 +23,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 +53,43 @@
    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.in("a.EmpStatus", empInsurance.getEmpStatus().split(","));
        }

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

    @Override
@@ -161,7 +169,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpInsurance(List<List<Object>> listObject,List<String>  returnList) {
    public void importEmpInsurance(List<List<Object>> listObject,List<String>  returnList,   List<DicItem> dicItems) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
@@ -191,7 +199,12 @@
                empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
            }
            empInsurance.setProposer(list.get(6).toString());
            empInsurance.setInsuranceGaers(list.get(7).toString());
            //婚姻状况
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"insuranceGaers")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                empInsurance.setInsuranceGaers(dicItem.getDicItemCode());
            }

            if (StringUtils.isNotBlank(list.get(8).toString())) {
                empInsurance.setReportStatus("未报告".equals(list.get(8).toString()) ? 0 : 1);
            }