From 4c93d581de8323667e08bcb00dac88762a49e183 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 12 五月 2021 10:04:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..eaf79e4 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
@@ -178,9 +178,15 @@
vo.setWorkCompany(oneData.get(16));
}
if(oneData.get(17) != null){
- vo.setRemark(oneData.get(17));
+ vo.setOutOrLocal(oneData.get(17));
}
- 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