修改bug

yz_08

2021-03-03 ce96649e79bf730aef73f3bec205c1c00a743635

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

@@ -2,6 +2,8 @@

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
@@ -86,9 +88,9 @@
        LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
        lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
        lambdaQueryWrapper.eq(EmpResign::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpResign::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        empResign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empResign.setCreator(operatorId);
@@ -102,10 +104,10 @@
        LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
        lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
        lambdaQueryWrapper.eq(EmpResign::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpResign::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpResign::getApplayDate,empResign.getApplayDate());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpResign dbData = this.getById(empResign.getResignId());
        empResign.setCreateTime(dbData.getCreateTime());
@@ -150,7 +152,7 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public void importEmpResign(List<List<Object>> listObject) {
   public void importEmpResign(List<List<Object>> listObject,List<String>  returnList) {
      for (List<Object> list : listObject) {
         EmpResign resign = new EmpResign();
         resign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));