From 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 17:14:19 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 215c28c..ffe1f9c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -393,6 +393,7 @@
             StringBuilder areaPath = new StringBuilder();
             areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
             //处理实有人口信息
+            Integer nub = 1;
             for (ComMngPopulationServeExcelVO vo : list) {
                 if (vo.getDoorNo().contains("号")) {
                     vo.setDoorNo(vo.getDoorNo().replace("号",""));
@@ -406,16 +407,21 @@
                 if(vo.getHouseNo().contains("号")){
                     vo.setHouseNo(vo.getHouseNo().replace("号",""));
                 }
-
                 log.info("开始查询小区街路巷是否存在");
                 //查询小区街路巷是否存在
                 ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
+                log.info("开始导入数据,行数:" + nub + "对象数据:" + vo.toString());
+                nub++;
+                log.info("街路巷对象:" + comMngVillageDO);
+                log.info("街路巷对象是否为空:" + ObjectUtils.isEmpty(comMngVillageDO));
+                log.info("街路巷对象是否为空2:" + (comMngVillageDO == null));
                 if (comMngVillageDO == null) {
                     ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                     BeanUtils.copyProperties(vo,mistake);
                     setMistake(mistake, vo);
                     mistake.setMistake("街路巷或小区号不存在,请先在“小区管理”中添加该小区:街路巷:"+ vo.getRoad() +",小区号:" + vo.getDoorNo());
                     mistakes.add(mistake);
+                    log.info("未查询到街路巷:"+ vo.getRoad() +",小区号:" + vo.getDoorNo());
                     continue;
                 }
                 StringBuilder address = new StringBuilder();

--
Gitblit v1.7.1