修改导入bug

yz_08

2021-03-17 c540c6c77b9f11bcf8b1688bb08ebaed7df12006

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

@@ -155,15 +155,18 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public void importEmpLeaveInfo(List<List<Object>> listObject,List<String>  returnList) {
   public void importEmpLeaveInfo(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems ) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
         EmpLeaveInfo leaveInfo = new EmpLeaveInfo();
         leaveInfo.setLeaveId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         leaveInfo.setEmpNumb(list.get(0).toString());
         List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            if(null == depts){
                depts =remoteDeptService.setDeptRedis();
            }
            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()));
@@ -190,7 +193,12 @@
         if (StringUtils.isNotBlank(list.get(7).toString())) {
            leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
         }
         leaveInfo.setLeaveType(list.get(8).toString().equals("病假")?"1":"2");
            //请假类型
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"leavetype")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                leaveInfo.setLeaveType(dicItem.getDicItemCode());
            }

         if (StringUtils.isNotBlank(list.get(9).toString())) {
            leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
         }