特殊群体导入取消人员关系限制

tangxiaobao

2021-08-27 c1f1d586e05a537c1745e6536e4324a2b50e490e

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

@@ -176,16 +176,16 @@
                    vo.setPhoto(oneData.get(6));
                }
                if (StringUtils.isNotEmpty(oneData.get(7))) {
                    Integer isOk = PopulRegiterNatureEnum.getCodeByName(oneData.get(7).trim());
                    if (isOk.equals(-1)) {
                        index++;
                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                        setVeteransMistake(oneData, mistake);
                        mistake.setMistake("您填写的户籍性质有误");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setRegiterNature(isOk);
//                    Integer isOk = PopulRegiterNatureEnum.getCodeByName(oneData.get(7).trim());
//                    if (isOk.equals(-1)) {
//                        index++;
//                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
//                        setVeteransMistake(oneData, mistake);
//                        mistake.setMistake("您填写的户籍性质有误");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    vo.setRegiterNature(oneData.get(7).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(8))) {
                    vo.setCensusRegister(oneData.get(8).trim());
@@ -338,7 +338,7 @@
                        index++;
                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                        setVeteransMistake(oneData, mistake);
                        mistake.setMistake("您填写的婚姻关系·有误");
                        mistake.setMistake("您填写的婚姻关系有误");
                        mistakes.add(mistake);
                        continue;
                    }