From 7034041e18f2354ac0f4b852f17a09b2144e1091 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 13 五月 2021 09:31:51 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
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 92f533d..d5ac3ed 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
@@ -5,9 +5,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
-import com.panzhihua.common.enums.PopulIsOkEnum;
-import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
-import com.panzhihua.common.enums.PopulSexEnum;
+import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
@@ -142,7 +140,7 @@
vo.setIsRent(PopulIsOkEnum.getCodeByName(oneData.get(4)));
}
if(oneData.get(5) != null){
- vo.setRelation(oneData.get(5));
+ vo.setRelation(PopulRelationEnum.getCodeByName(oneData.get(5)));
}
if(oneData.get(6) != null){
vo.setRoad(oneData.get(6));
@@ -166,10 +164,10 @@
vo.setNativePlace(oneData.get(12));
}
if(oneData.get(13) != null){
- vo.setCultureLevel(oneData.get(13));
+ vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(13)));
}
if(oneData.get(14) != null){
- vo.setMarriage(oneData.get(14));
+ vo.setMarriage(PopulMarriageEnum.getCodeByName(oneData.get(14)));
}
if(oneData.get(15) != null){
vo.setHealthy(oneData.get(15));
@@ -177,10 +175,22 @@
if(oneData.get(16) != null){
vo.setWorkCompany(oneData.get(16));
}
- if(oneData.get(17) != null){
- vo.setRemark(oneData.get(17));
+
+ if(oneData.get(17) != null && StringUtils.isNotEmpty(oneData.get(17))){
+ String outOrLocal = oneData.get(17);
+ if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.bd)){
+ vo.setOutOrLocal(1);
+ }else if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.wd)){
+ vo.setOutOrLocal(2);
+ }
}
- for (int i = 18; i < headSize; i++) {
+ if(oneData.get(18) != null){
+ vo.setCensusRegister(oneData.get(18));
+ }
+ if(oneData.get(19) != null){
+ vo.setRemark(oneData.get(19));
+ }
+ for (int i = 20; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
}
--
Gitblit v1.7.1