From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
index 49fc4a8..a3dde48 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
@@ -108,10 +108,10 @@
log.info("开始导入残疾人数据");
log.info("表格总数据：" + list.size());
if (list.size() == 0) {
- throw new ServiceException("500", "导入数据为空！");
+ throw new ServiceException("000", "导入数据为空！");
}
ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
- String Disability = Constants.DISABILITY_POPULATION_ERROR_LIST + communityId;
+ String Disability = Constants.DISABILITY_POPULATION_ERROR_LIST;
Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
// Map<String,Integer> dictMap = new HashMap<>();
@@ -131,7 +131,6 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
if(StringUtils.isEmpty(oneData.get(1))){
ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
index++;
@@ -178,7 +177,7 @@
}else{
vo.setSex(PopulSexEnum.nv.getCode());
}
- }
+
if(StringUtils.isNotEmpty(oneData.get(3))){
vo.setCertificateSituation(oneData.get(3));
}
@@ -224,33 +223,39 @@
continue;
}
vo.setDoorNo(oneData.get(10).trim());
- if(StringUtils.isEmpty(oneData.get(11))){
- index++;
- ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
- setDisabilityMistake(oneData, mistake);
- mistake.setMistake("楼排号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(11))){
+// index++;
+// ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+// setDisabilityMistake(oneData, mistake);
+// mistake.setMistake("楼排号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(11))) {
+ vo.setFloor(oneData.get(11).trim());
}
- vo.setFloor(oneData.get(11).trim());
- if(StringUtils.isEmpty(oneData.get(12))){
- index++;
- ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
- setDisabilityMistake(oneData, mistake);
- mistake.setMistake("单元号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(12))){
+// index++;
+// ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+// setDisabilityMistake(oneData, mistake);
+// mistake.setMistake("单元号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(12))) {
+ vo.setUnitNo(oneData.get(12).trim());
}
- vo.setUnitNo(oneData.get(12).trim());
- if(StringUtils.isEmpty(oneData.get(13))){
- index++;
- ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
- setDisabilityMistake(oneData, mistake);
- mistake.setMistake("户室不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(13))){
+// index++;
+// ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+// setDisabilityMistake(oneData, mistake);
+// mistake.setMistake("户室不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(13))) {
+ vo.setHouseNo(oneData.get(13).trim());
}
- vo.setHouseNo(oneData.get(13).trim());
if(StringUtils.isNotEmpty(oneData.get(14))){
Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(14));
if(isOk.equals(-1)){
--
Gitblit v1.7.1