社区后台基础数据库bug修改

tangxiaobao

2021-07-20 f6ca8436ffda7a313378301392e7ff5dda80fc73

社区后台基础数据库bug修改

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

@@ -179,11 +179,23 @@
                }
                if (StringUtils.isNotEmpty(oneData.get(5))) {

                    String ra = convertRelation(oneData.get(5));
//                    String ra = convertRelation(oneData.get(5));

                    String relation = dictMap.get(ra);
                    if (StringUtils.isEmpty(relation)) {
//                        vo.setRelationStr(ra);
//                    String relation = dictMap.get(oneData.get(5));
//                    if (StringUtils.isEmpty(relation)) {
////                        vo.setRelationStr(ra);
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第6列");
//                        importErrorVO.setErrorMsg("您填写的与户主关系有误");
//                        populationImportErrorVOList.add(importErrorVO);
//                        index++;
//                        continue;
//                    } else {
//                        vo.setRelation(Integer.valueOf(relation));
//                    }
                    Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
                    if (isOk.equals(-1)) {
//                        vo.setMarriageStr(ma);
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第6列");
                        importErrorVO.setErrorMsg("您填写的与户主关系有误");
@@ -191,7 +203,7 @@
                        index++;
                        continue;
                    } else {
                        vo.setRelation(Integer.valueOf(relation));
                        vo.setRelation(isOk);
                    }

                }
@@ -293,8 +305,8 @@
                    vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(18)));
                }
                if (StringUtils.isNotEmpty(oneData.get(19))) {
                    String ma = convertMarriage(oneData.get(19));
                    Integer isOk = PopulMarriageEnum.getCodeByName(ma);
//                    String ma = convertMarriage(oneData.get(19));
                    Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(19));
                    if (isOk.equals(-1)) {
//                        vo.setMarriageStr(ma);
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();