fix(bug修复): 导入的新员工增加了入离职记录；重新处理了导入的日期格式

luoyb

2021-08-03 fb9823428a7705d8ed8e2f4128e525df3781e968

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

@@ -72,7 +72,7 @@
            queryWrapper.like("a.CertificateNumb", empInsurance.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empInsurance.getDeptName())) {
            queryWrapper.like("a.DeptName", empInsurance.getDeptName());
            queryWrapper.like("b.allDeptName", empInsurance.getDeptName());
        }
        if (StringUtils.isNotBlank(empInsurance.getApplayDateStr())) {
            queryWrapper.between("a.ApplayDate", empInsurance.getApplayDateStr().split(",")[0],
@@ -85,7 +85,7 @@
            queryWrapper.eq("a.ReportStatus", empInsurance.getReportStatus());
        }
        if (StringUtils.isNotBlank(empInsurance.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empInsurance.getEmpStatus().split(","));
            queryWrapper.in("b.EmpStatus", empInsurance.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -203,19 +203,25 @@
                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());
            empInsurance.setJobName(list.get(2).toString());
            empInsurance.setEmpName(list.get(3).toString());
            empInsurance.setCertificateNumb(list.get(4).toString());
            if (StringUtils.isNotBlank(list.get(5).toString())) {
                empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empInsurance.setApplayDate(DateUtil.parse(list.get(5).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

            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());
            }