From 4da8d6c1e9d37606f15dca9fb552890724db4628 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 七月 2021 16:36:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 bef205c..f5f0949 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
@@ -168,6 +168,8 @@
continue;
}
vo.setIsRent(isOk);
+ }else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
}
if(StringUtils.isNotEmpty(oneData.get(5))){
@@ -341,7 +343,7 @@
}
vo.setOutOrLocal(isOk);
}else {
- vo.setOutOrLocal(1);
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
}
if(StringUtils.isNotEmpty(oneData.get(26))){
vo.setCensusRegister(oneData.get(26).trim());
--
Gitblit v1.7.1