fix(bug修复): 部门管理、员工信息查询与显示

luoyb

2021-03-10 f22196a273dae1cc4f67bf6e4806e0e33fae7997

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

@@ -171,7 +171,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
   public void importEmpContractInfo(List<List<Object>> listObject,List<String>  returnList) {
   public void importEmpContractInfo(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems ) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
@@ -210,7 +210,12 @@
         if (StringUtils.isNotBlank(list.get(8).toString())) {
            contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
         }
         contractInfo.setContractStatus(list.get(9).toString());
            //合同
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                contractInfo.setContractStatus(dicItem.getDicItemCode());
            }

         contractInfo.setTransactor(list.get(10).toString());
         contractInfo.setRemark(list.get(11).toString());