Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-09 6cda44af74fe63b2e276af3228c7bca00dec7ffa

 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;
@@ -93,21 +94,24 @@

    @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());
@@ -197,4 +201,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;
    }
}