From 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 11 八月 2021 17:53:57 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 78 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 36 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 0e8d7dc..2c2d7ad 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
@@ -302,45 +302,51 @@
continue;
}
vo.setDoorNo(oneData.get(7).trim());
- if(StringUtils.isEmpty(oneData.get(8))){
-// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
-// importErrorVO.setErrorPosition("第" + index + "行，第9列");
-// importErrorVO.setErrorMsg("楼排号不可为空");
-// populationImportErrorVOList.add(importErrorVO);
- index++;
- ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("楼排号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(8))){
+//// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+//// importErrorVO.setErrorPosition("第" + index + "行，第9列");
+//// importErrorVO.setErrorMsg("楼排号不可为空");
+//// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("楼排号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setFloor(oneData.get(8).trim());
}
- vo.setFloor(oneData.get(8).trim());
- if(StringUtils.isEmpty(oneData.get(9))){
-// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
-// importErrorVO.setErrorPosition("第" + index + "行，第10列");
-// importErrorVO.setErrorMsg("单元号不可为空");
-// populationImportErrorVOList.add(importErrorVO);
- index++;
- ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("单元号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(9))){
+//// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+//// importErrorVO.setErrorPosition("第" + index + "行，第10列");
+//// importErrorVO.setErrorMsg("单元号不可为空");
+//// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("单元号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setUnitNo(oneData.get(9).trim());
}
- vo.setUnitNo(oneData.get(9).trim());
- if(StringUtils.isEmpty(oneData.get(10))){
-// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
-// importErrorVO.setErrorPosition("第" + index + "行，第11列");
-// importErrorVO.setErrorMsg("户室不可为空");
-// populationImportErrorVOList.add(importErrorVO);
- index++;
- ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("户室不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(10))){
+//// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+//// importErrorVO.setErrorPosition("第" + index + "行，第11列");
+//// importErrorVO.setErrorMsg("户室不可为空");
+//// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("户室不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setHouseNo(oneData.get(10).trim());
}
- vo.setHouseNo(oneData.get(10).trim());
if(StringUtils.isNotEmpty(oneData.get(11))){
vo.setBuildPurpose(oneData.get(11).trim());
}
--
Gitblit v1.7.1