From fcccf88621e51fd8b5e856dc00e087914e293951 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 25 五月 2021 14:17:03 +0800
Subject: [PATCH] 实有人口优化
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 102a8e4..a87197e 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
@@ -165,6 +165,9 @@
//查询当前用户房屋信息
List<ComMngHouseVo> houseList = comMngPopulationHouseDAO.getPopulHouseListByPopulId(populationId);
if(!houseList.isEmpty()){
+ houseList.forEach(house ->{
+
+ });
comMngPopulationVO.setHouseList(houseList);
}
@@ -285,8 +288,7 @@
if(populationHouseDO == null){
//查询该房屋未建立，执行建立房屋信息
populationHouseDO = new ComMngPopulationHouseDO();
- populationHouseDO.setAlley(vo.getRoad());
- populationHouseDO.setHouseNum(vo.getDoorNo());
+ populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
populationHouseDO.setCommunityId(communityId);
populationHouseDO.setFloor(vo.getFloor());
populationHouseDO.setUnitNo(vo.getUnitNo());
@@ -571,8 +573,21 @@
populationDO.setStreetId(comActDO.getStreetId());
}
+ //查询当前用户所有房屋id
+ List<Long> houseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByUserId(vo.getId());
//清除用户房屋居住信息
comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(vo.getId());
+ if(!houseIds.isEmpty()){
+ houseIds.forEach(houseId -> {
+ //查询当前房屋下是否有人口信息，如果没有则将房屋设置为空户
+ List<Long> oldHouseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByhHosueId(houseId);
+ if(oldHouseIds.isEmpty()){
+ //修改房屋信息为空户
+ comMngPopulationHouseDAO.updateHouseByIsEmpty(houseId,1);
+ }
+ });
+ }
+
//更新用户的房屋信息
Long houseId = null;
@@ -586,6 +601,9 @@
houseId = houseEditDto.getId();//居住地
}
populationHouseUserDOList.add(populationHouseUserDO);
+
+ //修改房屋信息不为空户
+ comMngPopulationHouseDAO.updateHouseByIsEmpty(houseEditDto.getId(),2);
}
}
comMngPopulationHouseUserService.saveBatch(populationHouseUserDOList);
--
Gitblit v1.7.1