修复导入空行的问题

yijiusmile

2021-04-20 096f6025e0212b23df8485b56818c3f0b019aa26

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

@@ -89,7 +89,7 @@
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
        IPage<EmpInsurance> iPage =  empInsuranceMapper.selectPageVo(page, queryWrapper);
        List<EmpInsurance> list = iPage.getRecords();
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
@@ -203,7 +203,7 @@
                returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            empInsurance.setDelFlag(2);
            empInsurance.setDelFlag(0);
            empInsurance.setEmpId(empBaseInfo.getEmpId());
            empInsurance.setDeptName(list.get(1).toString());
            empInsurance.setDeptId(dept.getDeptId());
@@ -214,21 +214,27 @@
                empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
            }
            empInsurance.setProposer(list.get(6).toString());
            //婚姻状况
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"insuranceGaers")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
            //社保档位
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"INSURANCETYPE")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                empInsurance.setInsuranceGaers(dicItem.getDicItemCode());
            }

            if (StringUtils.isNotBlank(list.get(8).toString())) {
                empInsurance.setReportStatus("未报告".equals(list.get(8).toString()) ? 0 : 1);

            dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"reportStatus")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                empInsurance.setReportStatus(Integer.valueOf(dicItem.getDicItemCode()));
            }
            if (StringUtils.isNotBlank(list.get(8).toString())) {
                empInsurance.setApplayStatus("未申请".equals(list.get(8).toString()) ? 0 : 1);

              dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"applayStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                empInsurance.setApplayStatus(Integer.valueOf(dicItem.getDicItemCode()));
            }
            empInsurance.setAuditor(list.get(9).toString());
            empInsurance.setRemark(list.get(10).toString());

            empInsurance.setAuditor(list.get(10).toString());
            empInsurance.setRemark(list.get(11).toString());
            empInsurance.setEmpStatus(empBaseInfo.getEmpStatus());
            empInsurance.setCreator(FebsUtil.getUserId());
            this.save(empInsurance);
        }
    }