修改bug

yz

2021-03-12 6a12ce06674bdbee846144d7e21e9fff8d4c5ef3

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

@@ -177,7 +177,7 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public void importEmpLaborTrouble(List<List<Object>> listObject,List<String>  returnList) {
   public void importEmpLaborTrouble(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems ) {
      for (List<Object> list : listObject) {
         if (list.size()==0){
            continue;
@@ -206,7 +206,14 @@
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            empLabortrouble.setArbitrationDate(DateUtil.parseDateTime(list.get(5).toString()));
         }
         empLabortrouble.setArbitrationType(list.get(6).toString());

         //仲裁类型
         DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"zctype")&&StrUtil.equals(j.getDicItemName(),list.get(6).toString())).findFirst().orElse(null);
         if (null!=dicItem){
            empLabortrouble.setArbitrationType(dicItem.getDicItemCode());
         }


         empLabortrouble.setArbitrationReason(list.get(7).toString());
         empLabortrouble.setReporter(list.get(8).toString());
         empLabortrouble.setRemark(list.get(9).toString());