Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-11 fda3f979616e3c5e26993ec7033900cd188ea296

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

@@ -2,6 +2,7 @@

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
@@ -69,9 +70,15 @@
        if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
            queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empWorkexperience.getEmpStatus().split(","));
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());

        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
    }

@@ -79,26 +86,32 @@
    public List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
        if(StringUtils.isNotBlank(empWorkexperience.getEmpNumb())){
            queryWrapper.eq(EmpWorkExperience::getEmpNumb,empWorkexperience.getEmpNumb());
        }
        return this.baseMapper.selectList(queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpWorkExperience(EmpWorkExperience empWorkexperience) {
    public void createEmpWorkExperience(EmpWorkExperience empWorkexperience) throws FebsException {
        String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
                .map(u -> u.getUserId().toString())
                .orElse("1");
        empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empWorkexperience.setCreator(operatorId);
        empWorkexperience.setModifier(operatorId);
        this.save(empWorkexperience);
        if(!checkRepetitiveData(empWorkexperience)) {
            empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empWorkexperience.setCreator(operatorId);
            empWorkexperience.setModifier(operatorId);
            this.save(empWorkexperience);
        } else {
            throw new FebsException("已存在此工作经历");
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpWorkExperience(EmpWorkExperience empWorkexperience) {
        String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
                .map(u -> u.getUserId().toString())
        String operatorId = Optional.of(FebsUtil.getUserId())
                .orElse("1");
        EmpWorkExperience dbData = this.getById(empWorkexperience.getWorkExperienceId());
        empWorkexperience.setCreateTime(dbData.getCreateTime());
@@ -155,20 +168,17 @@
            if (list.size()==0){
                continue;
            }
            Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
            EmpBaseInfo empId = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
            if (null == empId){
                returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(4).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(4).toString()));
                continue;
            }
         EmpWorkExperience workExperience = new EmpWorkExperience();
            workExperience.setEmpId(empId.getEmpId());
            //工作经历中的部门
            workExperience.setDeptName(list.get(4).toString());
            workExperience.setDeptId(dept.getDeptId());
            //实际部门ID
            workExperience.setDeptId(empId.getDeptId());
         workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         workExperience.setEmpNumb(list.get(0).toString());
         workExperience.setEmpName(list.get(1).toString());
@@ -188,4 +198,13 @@
         this.save(workExperience);
      }
   }

   private boolean checkRepetitiveData(EmpWorkExperience empWorkExperience){
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkExperience.getDelFlag());
        queryWrapper.eq(EmpWorkExperience::getCertificateNumb, empWorkExperience.getCertificateNumb());
        queryWrapper.eq(EmpWorkExperience::getBeginDate,empWorkExperience.getBeginDate());

        return this.list(queryWrapper).size()>0;
    }
}