修改bug

yz_08

2021-03-23 352f4d4a3ae3145f2bd43d0802150877349750d6

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

@@ -155,7 +155,7 @@

   @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||StrUtil.isBlank(list.get(0).toString())){
                continue;
@@ -193,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()));
         }