From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
index 75dac62..313be0f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
@@ -1,5 +1,7 @@
 package com.panzhihua.service_community.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
@@ -10,10 +12,16 @@
 import com.panzhihua.common.model.vos.community.ComMngPopulationHouseDetailAdminVO;
 import com.panzhihua.common.model.vos.community.ComMngPopulationHouseTotalVO;
 import com.panzhihua.common.model.vos.community.ComMngPopulationHouseUserAdminVO;
+import com.panzhihua.service_community.dao.ComActVillageDAO;
+import com.panzhihua.service_community.dao.ComMngPopulationDAO;
 import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO;
 import com.panzhihua.service_community.dao.ComMngPopulationHouseUserDAO;
+import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
 import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
+import com.panzhihua.service_community.model.dos.ComMngPopulationHouseUserDO;
+import com.panzhihua.service_community.model.dos.ComMngVillageDO;
 import com.panzhihua.service_community.service.ComMngPopulationHouseService;
+import com.panzhihua.service_community.service.ComMngVillageService;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
@@ -35,6 +43,10 @@
 
     @Resource
     private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
+    @Resource
+    private ComMngPopulationDAO comMngPopulationDAO;
+    @Resource
+    private ComActVillageDAO comActVillageDAO;
 
     /**
      * 查询房屋级联菜单
@@ -60,7 +72,8 @@
                 break;
             case 2:
                 if(houseDO != null){
-                    cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNum(houseDO.getAlley(),cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
+                    ComMngVillageDO villageDO = comActVillageDAO.selectById(houseDO.getVillageId());
+                    cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNum(villageDO.getAlley(),cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                     cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum()))), ArrayList::new));
                     cascadeHouseVOList.forEach(cascade -> {
                         cascade.setName(cascade.getHouseNum());
@@ -69,7 +82,8 @@
                 break;
             case 3:
                 if(houseDO != null) {
-                    cascadeHouseVOList = this.baseMapper.getHouseLevelByFloor(houseDO.getAlley(), houseDO.getHouseNum(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
+                    ComMngVillageDO villageDO = comActVillageDAO.selectById(houseDO.getVillageId());
+                    cascadeHouseVOList = this.baseMapper.getHouseLevelByFloor(villageDO.getAlley(), villageDO.getHouseNum(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                     cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor()))), ArrayList::new));
                     cascadeHouseVOList.forEach(cascade -> {
                         cascade.setName(cascade.getFloor());
@@ -194,6 +208,13 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R deleteHouses(List<Long> Ids){
+        LambdaQueryWrapper<ComMngPopulationHouseUserDO> paramWrapper = Wrappers.lambdaQuery();
+        paramWrapper.in(ComMngPopulationHouseUserDO::getHouseId, Ids);
+        List<ComMngPopulationHouseUserDO> mngPopulationDOList = comMngPopulationHouseUserDAO.selectList(paramWrapper);
+        if (!mngPopulationDOList.isEmpty()) {
+            return R.fail("无法删除,已绑定实有人口!");
+        }
+
         if(this.baseMapper.deleteBatchIds(Ids) > 0){
             return R.ok();
         }else{

--
Gitblit v1.7.1