From af70e4d0660f1ce8c22d446743ff349dc66afeac Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 20 七月 2021 10:41:43 +0800
Subject: [PATCH] 社区后台基础数据库bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 0d27356..8d3abd7 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
@@ -185,8 +185,8 @@
// }else{
// vo.setRelation(Integer.valueOf(relation));
// }
- String relation = convertMarriage(oneData.get(5));
- Integer isOk = PopulRelationEnum.getCodeByName(relation);
+// String relation = convertMarriage(oneData.get(5));
+ Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
if(isOk.equals(-1)){
// vo.setMarriageStr(ma);
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
@@ -297,8 +297,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();
--
Gitblit v1.7.1