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

luoyb

2021-03-16 1703c96b6833244340dc10bf746d8c08a331008c

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

@@ -7,26 +7,33 @@
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
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.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.util.StrUtil;
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.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.EmpPhysicalExam;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpPhysicalExamMapper;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
import cn.hutool.core.date.DateUtil;
@@ -48,43 +55,51 @@

    private final RedisService redisService;
    private final EmpPhysicalExamMapper empPhysicalexamMapper;
    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<EmpPhysicalExam> findEmpPhysicalExams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
        LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpPhysicalExam::getDelFlag, empPhysicalexam.getDelFlag());
       QueryWrapper<EmpPhysicalExam> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empPhysicalexam.getDelFlag());
        if (StringUtils.isNotBlank(empPhysicalexam.getEmpNumb())) {
            queryWrapper.like(EmpPhysicalExam::getEmpNumb, empPhysicalexam.getEmpNumb());
            queryWrapper.like("a.EmpNumb", empPhysicalexam.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getEmpName())) {
            queryWrapper.like(EmpPhysicalExam::getEmpName, empPhysicalexam.getEmpName());
            queryWrapper.like("a.EmpName", empPhysicalexam.getEmpName());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getCertificateNumb())) {
            queryWrapper.like(EmpPhysicalExam::getCertificateNumb, empPhysicalexam.getCertificateNumb());
            queryWrapper.like("a.CertificateNumb", empPhysicalexam.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getDeptName())) {
            queryWrapper.like(EmpPhysicalExam::getDeptName, empPhysicalexam.getDeptName());
            queryWrapper.like("a.DeptName", empPhysicalexam.getDeptName());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamDateStr())) {
            queryWrapper.between(EmpPhysicalExam::getPhysicalExamDate, empPhysicalexam.getPhysicalExamDateStr().split(",")[0], empPhysicalexam.getPhysicalExamDateStr().split(",")[1]);
            queryWrapper.between("a.PhysicalExamDate", empPhysicalexam.getPhysicalExamDateStr().split(",")[0], empPhysicalexam.getPhysicalExamDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamType())) {
            queryWrapper.eq(EmpPhysicalExam::getPhysicalExamType, empPhysicalexam.getPhysicalExamType());
            queryWrapper.eq("a.PhysicalExamType", empPhysicalexam.getPhysicalExamType());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getEcg())) {
            queryWrapper.eq(EmpPhysicalExam::getEcg, empPhysicalexam.getEcg());
            queryWrapper.eq("a.Ecg", empPhysicalexam.getEcg());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getConclusion())) {
            queryWrapper.like(EmpPhysicalExam::getConclusion, empPhysicalexam.getConclusion());
            queryWrapper.like("a.Conclusion", empPhysicalexam.getConclusion());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
            queryWrapper.eq(EmpPhysicalExam::getEmpStatus, empPhysicalexam.getEmpStatus());
            queryWrapper.in("a.EmpStatus", empPhysicalexam.getEmpStatus().split(","));
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<EmpPhysicalExam> iPage = this.page(page, queryWrapper);
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        IPage<EmpPhysicalExam> iPage = empPhysicalexamMapper.selectPageVo(page, queryWrapper);

        List<EmpPhysicalExam> list = iPage.getRecords();
        //设置字典数据
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
@@ -167,16 +182,30 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
   public void importEmpPhysicalExam(List<List<Object>> listObject) {
   public void importEmpPhysicalExam(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
         EmpPhysicalExam physicalExam = new EmpPhysicalExam();
         physicalExam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         physicalExam.setEmpNumb(list.get(0).toString());
         physicalExam.setDeptName(list.get(1).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();
         physicalExam.setDeptId(deptId);
            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;
            }
            physicalExam.setDelFlag(2);
            physicalExam.setEmpId(empId);
            physicalExam.setDeptName(list.get(1).toString());
         physicalExam.setDeptId(dept.getDeptId());
         physicalExam.setJobName(list.get(2).toString());
         physicalExam.setEmpName(list.get(3).toString());
         physicalExam.setCertificateNumb(list.get(4).toString());
@@ -185,14 +214,25 @@
         if (StringUtils.isNotBlank(list.get(7).toString())) {
            physicalExam.setPhysicalExamDate(DateUtil.parseDate(list.get(7).toString()));
         }
         physicalExam.setPhysicalExamType(list.get(8).toString());
            //体检
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"physicalExamType")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                physicalExam.setPhysicalExamType(dicItem.getDicItemCode());
            }

         physicalExam.setBloodPressure(list.get(9).toString());
         physicalExam.setTransaminase(list.get(10).toString());
         physicalExam.setEcg(list.get(11).toString());
         //心电图

              dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"ecg")&&StrUtil.equals(j.getDicItemName(),list.get(11).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                physicalExam.setEcg(dicItem.getDicItemCode());

            }
         physicalExam.setConclusion(list.get(12).toString());
         physicalExam.setReviewRecord(list.get(13).toString());
         physicalExam.setRemark(list.get(14).toString());
         this.save(physicalExam);
      }
   }
}
}