yz
2021-03-04 6343cac51e460280c721c9db0238b62389146590
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -8,6 +8,7 @@
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
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;
@@ -135,16 +136,22 @@
    @Override
   @Transactional(rollbackFor = Exception.class)
    public void importEmpBadRecord(List<List<Object>> listObject) {
    public void importEmpRemarkInfo(List<List<Object>> listObject,List<String>  returnList) {
       for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
          EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
          empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
          empRemarkinfo.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(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
         empRemarkinfo.setDeptName(list.get(1).toString());
         empRemarkinfo.setDeptId(deptId);
         empRemarkinfo.setDeptId(dept.getDeptId());
         empRemarkinfo.setJobName(list.get(2).toString());
         empRemarkinfo.setEmpName(list.get(3).toString());
         empRemarkinfo.setCertificateNumb(list.get(4).toString());
@@ -155,4 +162,4 @@
         this.save(empRemarkinfo);
       }
    }
}
}