修改bug

yz_08

2021-03-03 ce96649e79bf730aef73f3bec205c1c00a743635

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

@@ -7,6 +7,7 @@
import java.util.Optional;

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 org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -89,10 +90,10 @@
    public void createEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
        LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
        lambdaQueryWrapper.eq(EmpUnemployment::getDelFlag,0);
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate() );
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empUnemployment.setCreator(operatorId);
@@ -106,10 +107,10 @@
        LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
        lambdaQueryWrapper.eq(EmpUnemployment::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate());
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId,empUnemployment.getUnemploymentId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpUnemployment dbData = this.getById(empUnemployment.getUnemploymentId());
        empUnemployment.setCreateTime(dbData.getCreateTime());
@@ -155,7 +156,7 @@

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