From 0063ba470b8d6db99d7786ec1fdceb1703ba985a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 01 六月 2021 17:11:57 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 109 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
index d70c094..f8bf9a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -135,16 +135,52 @@
}
}
if(StringUtils.isNotEmpty(oneData.get(2))){
+ String nation = oneData.get(2);
+ if(!nation.contains("族")){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第3列");
+ importErrorVO.setErrorMsg("您填写的民族格式有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
vo.setNation(oneData.get(2));
}
if(StringUtils.isNotEmpty(oneData.get(3))){
- vo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3)));
+ Integer isOk = PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第4列");
+ importErrorVO.setErrorMsg("您填写的政治面貌有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setPoliticalOutlook(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(4))){
- vo.setIsRent(PopulIsOkEnum.getCodeByName(oneData.get(4)));
+ Integer isOk = PopulIsOkEnum.getCodeByName(oneData.get(4));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第5列");
+ importErrorVO.setErrorMsg("您填写的是否租住有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setIsRent(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(5))){
- vo.setRelation(PopulRelationEnum.getCodeByName(oneData.get(5)));
+ Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第6列");
+ importErrorVO.setErrorMsg("您填写的与户主关系有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setRelation(isOk);
}
if(StringUtils.isEmpty(oneData.get(6))){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
@@ -198,10 +234,28 @@
vo.setNativePlace(oneData.get(12).trim());
}
if(StringUtils.isNotEmpty(oneData.get(13))){
- vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(13).trim()));
+ Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(13));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第14列");
+ importErrorVO.setErrorMsg("您填写的文化程度有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setCultureLevel(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(14))){
- vo.setMarriage(PopulMarriageEnum.getCodeByName(oneData.get(14).trim()));
+ Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(14));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第14列");
+ importErrorVO.setErrorMsg("您填写的婚姻状况有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setMarriage(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(15))){
vo.setHealthy(oneData.get(15).trim());
@@ -216,19 +270,64 @@
vo.setCensusRegister(oneData.get(18).trim());
}
if(StringUtils.isNotEmpty(oneData.get(19))){
- vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName(oneData.get(19).trim()));
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(19));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第20列");
+ importErrorVO.setErrorMsg("您填写的外地or本地有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(20))){
- vo.setHouseStatus(PopulHouseStatusEnum.getCodeByName(oneData.get(20).trim()));
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(20));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第21列");
+ importErrorVO.setErrorMsg("您填写的房屋状态有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setHouseStatus(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(21))){
- vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(21).trim()));
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(21));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第22列");
+ importErrorVO.setErrorMsg("您填写的房屋用途有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setHousePurpose(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(22))){
- vo.setControlStatus(PopulHouseControlStatusEnum.getCodeByName(oneData.get(22).trim()));
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(22));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第23列");
+ importErrorVO.setErrorMsg("您填写的管控状态有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setControlStatus(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(23))){
- vo.setIsResidence(PopulIsOksEnum.getCodeByName(oneData.get(23).trim()));
+ Integer isOk = PopulIsOksEnum.getCodeByName(oneData.get(23));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第23列");
+ importErrorVO.setErrorMsg("您填写的是否是居住地有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setIsResidence(isOk);
}
for (int i = 24; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
--
Gitblit v1.7.1