提交

孔祥富

2021-03-04 2616c30cd0ebe33f4e96175e20e5d7c933b29cc8

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

@@ -4,12 +4,15 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +48,7 @@

   private final RedisService redisService;
    private final EmpLaborTroubleMapper empLabortroubleMapper;
   private final IEmpBaseInfoService empBaseInfoService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");
@@ -104,9 +108,9 @@
      LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
      lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
      lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
      lambdaQueryWrapper.eq(EmpLaborTrouble::getDelFlag,0);
      lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
      if (this.count(lambdaQueryWrapper) > 0) {
         throw new FebsException("当日记录已存在");
         throw new FebsException(MyConstant.MESSAGE);
      }
        empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empLabortrouble.setCreator(operatorId);
@@ -120,10 +124,10 @@
      LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
      lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
      lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
      lambdaQueryWrapper.eq(EmpLaborTrouble::getDelFlag,0);
      lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
      lambdaQueryWrapper.ne(EmpLaborTrouble::getArbitrationId,empLabortrouble.getArbitrationId());
      if (this.count(lambdaQueryWrapper) > 0) {
         throw new FebsException("当日记录已存在");
         throw new FebsException(MyConstant.MESSAGE);
      }
        EmpLaborTrouble dbData = this.getById(empLabortrouble.getArbitrationId());
        empLabortrouble.setCreateTime(dbData.getCreateTime());
@@ -168,16 +172,29 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public void importEmpLaborTrouble(List<List<Object>> listObject) {
   public void importEmpLaborTrouble(List<List<Object>> listObject,List<String>  returnList) {
      for (List<Object> list : listObject) {
         if (list.size()==0){
            continue;
         }
         EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
         empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         empLabortrouble.setEmpNumb(list.get(0).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();
         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;
         }
         empLabortrouble.setDelFlag(2);
         empLabortrouble.setEmpId(empId);
         empLabortrouble.setDeptName(list.get(1).toString());
         empLabortrouble.setDeptId(deptId);
         empLabortrouble.setDeptId(dept.getDeptId());
         empLabortrouble.setJobName(list.get(2).toString());
         empLabortrouble.setEmpName(list.get(3).toString());
         empLabortrouble.setCertificateNumb(list.get(4).toString());