From 36dd34a7eb8733a9ec66d6d5c305bdf957421655 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 11 八月 2021 17:44:06 +0800
Subject: [PATCH] 实有人口新增模板导入接口开发、无楼栋无单元号优化
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
index f3d83d4..2932f12 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
@@ -216,33 +216,39 @@
continue;
}
vo.setDoorNo(oneData.get(6).trim());
- if(StringUtils.isEmpty(oneData.get(7))){
- index++;
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- setDrugMistake(oneData, mistake);
- mistake.setMistake("楼排号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(7))){
+// index++;
+// ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+// setDrugMistake(oneData, mistake);
+// mistake.setMistake("楼排号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setFloor(oneData.get(7).trim());
}
- vo.setFloor(oneData.get(7).trim());
- if(StringUtils.isEmpty(oneData.get(8))){
- index++;
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- setDrugMistake(oneData, mistake);
- mistake.setMistake("单元号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(8))){
+// index++;
+// ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+// setDrugMistake(oneData, mistake);
+// mistake.setMistake("单元号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setUnitNo(oneData.get(8).trim());
}
- vo.setUnitNo(oneData.get(8).trim());
- if(StringUtils.isEmpty(oneData.get(9))){
- index++;
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- setDrugMistake(oneData, mistake);
- mistake.setMistake("户室不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(9))){
+// index++;
+// ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+// setDrugMistake(oneData, mistake);
+// mistake.setMistake("户室不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setHouseNo(oneData.get(9).trim());
}
- vo.setHouseNo(oneData.get(9).trim());
if(StringUtils.isNotEmpty(oneData.get(10))){
Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(10));
if(isOk.equals(-1)){
--
Gitblit v1.7.1