From 11909203390b1207b8b43020cfd7348ec9fdfa95 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 19 七月 2021 15:44:31 +0800
Subject: [PATCH] 社区后台基础数据库bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 ad774c2..0d27356 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
@@ -171,11 +171,24 @@
}
if(StringUtils.isNotEmpty(oneData.get(5))){
- String ra = convertRelation(oneData.get(5));
-
- String relation = dictMap.get(ra);
- if(StringUtils.isEmpty(relation)){
-// vo.setRelationStr(ra);
+// String ra = convertRelation(oneData.get(5));
+//
+// String relation = dictMap.get(ra);
+// 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));
+// }
+ String relation = convertMarriage(oneData.get(5));
+ Integer isOk = PopulRelationEnum.getCodeByName(relation);
+ if(isOk.equals(-1)){
+// vo.setMarriageStr(ma);
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorPosition("第" + index + "行，第6列");
importErrorVO.setErrorMsg("您填写的与户主关系有误");
@@ -183,9 +196,8 @@
index++;
continue;
}else{
- vo.setRelation(Integer.valueOf(relation));
+ vo.setRelation(isOk);
}
-
}
if(StringUtils.isEmpty(oneData.get(6))){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
@@ -434,8 +446,6 @@
}else{
if(!populationImportErrorVOList.isEmpty()){
throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
- }else {
- R r1 = communityService.listSavePopulationConfirm(newVoList, communityId);
}
}
} catch (NumberFormatException e) {
--
Gitblit v1.7.1