From e209c5e490f56c80c209fbe9c3613069cc0dd70d Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 27 七月 2021 21:58:30 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 260ebe2..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
@@ -122,7 +122,7 @@
index++;
continue;
}
- vo.setCardNo(oneData.get(1));
+ vo.setCardNo(oneData.get(1).toUpperCase());
//根据身份证号码解析年龄以及性别
//获取用户生日
String birthday = vo.getCardNo().substring(6, 14);
@@ -168,6 +168,8 @@
continue;
}
vo.setIsRent(isOk);
+ }else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
}
if(StringUtils.isNotEmpty(oneData.get(5))){
@@ -330,16 +332,18 @@
vo.setWorkCompany(oneData.get(24).trim());
}
if(StringUtils.isNotEmpty(oneData.get(25))){
- Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(25));
- if(isOk.equals(-1)){
- ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行，第26列");
- importErrorVO.setErrorMsg("您填写的本地/外地有误");
- populationImportErrorVOList.add(importErrorVO);
- index++;
- continue;
- }
- vo.setOutOrLocal(isOk);
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(25));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第26列");
+ importErrorVO.setErrorMsg("您填写的本地/外地有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ }else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
}
if(StringUtils.isNotEmpty(oneData.get(26))){
vo.setCensusRegister(oneData.get(26).trim());
--
Gitblit v1.7.1