Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-07-27 e209c5e490f56c80c209fbe9c3613069cc0dd70d

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java

@@ -122,7 +122,7 @@
                        index++;
                        continue;
                    }
                    vo.setCardNo(oneData.get(1));
                    vo.setCardNo(oneData.get(1).toUpperCase());
                    //根据身份证号码解析年龄以及性别
                    //获取用户生日
                    String birthday = vo.getCardNo().substring(6, 14);
@@ -168,6 +168,8 @@
                        continue;
                    }
                    vo.setIsRent(isOk);
                }else {
                    vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
                }
                if(StringUtils.isNotEmpty(oneData.get(5))){

@@ -330,16 +332,18 @@
                    vo.setWorkCompany(oneData.get(24).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(25))){
                    Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(25));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第26列");
                        importErrorVO.setErrorMsg("您填写的本地/外地有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setOutOrLocal(isOk);
                        Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(25));
                        if(isOk.equals(-1)){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第26列");
                            importErrorVO.setErrorMsg("您填写的本地/外地有误");
                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            continue;
                        }
                        vo.setOutOrLocal(isOk);
                }else {
                    vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
                }
                if(StringUtils.isNotEmpty(oneData.get(26))){
                    vo.setCensusRegister(oneData.get(26).trim());