From 95c301090d0a582dd9f43391d72d8c8b2cea9ee9 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期五, 06 八月 2021 11:54:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-community/src/main/java/com/java110/community/bmo/initializeBuildingUnit/impl/IinitializeBuildingUnitBmoImpl.java |   92 +++++++++++++++++++++++++++------------------
 1 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/bmo/initializeBuildingUnit/impl/IinitializeBuildingUnitBmoImpl.java b/service-community/src/main/java/com/java110/community/bmo/initializeBuildingUnit/impl/IinitializeBuildingUnitBmoImpl.java
index b3e9f35..32b3053 100644
--- a/service-community/src/main/java/com/java110/community/bmo/initializeBuildingUnit/impl/IinitializeBuildingUnitBmoImpl.java
+++ b/service-community/src/main/java/com/java110/community/bmo/initializeBuildingUnit/impl/IinitializeBuildingUnitBmoImpl.java
@@ -70,52 +70,70 @@
         floorDto.setCommunityId(communityId);
         List<FloorDto> floorDtos =  floorInnerServiceSMOImpl.queryFloors(floorDto);
         List floors = new ArrayList();
+        int communitys = 0;
         if(null != floorDtos && floorDtos.size() > 0){
             for (FloorDto floorDtotmp: floorDtos){
                 floors.add(floorDtotmp.getFloorId());
             }
+            Map floorIds = new HashMap<String,String []>();
+            floorIds.put("floorIds",floors.toArray(new String[floors.size()]));
+            massage.append( "寮�濮嬫牸寮忓寲灏忓尯鏁版嵁锛�" );
+            //鍗曞厓
+            communitys = initializeBuildingUnitSMOImpl.deleteBuildingUnit(floorIds);
         }
-        Map floorIds = new HashMap<String,String []>();
-        floorIds.put("floorIds",floors.toArray(new String[floors.size()]));
-        //鍗曞厓
-        int communitys = initializeBuildingUnitSMOImpl.deleteBuildingUnit(floorIds);
 
         if(communitys > 0){
             massage.append("鍗曞厓鍒濆鍖栨垚鍔熴��"+communitys+"銆�");
-            Map communityIds = new HashMap<String,String []>();
-            floorIds.put("communityId",communityId);
-            //妤兼爧
-            int deleteFlag = initializeBuildingUnitSMOImpl.deletefFloor(communityIds);
-            if(deleteFlag > 0){
-                massage.append("妤兼爧鍒濆鍖栨垚鍔熴��"+deleteFlag+"銆�");
-            }
-            //鎴垮眿
-            int deleteFlagRoot = initializeBuildingUnitSMOImpl.deleteBuildingRoom(communityIds);
-            if(deleteFlagRoot > 0){
-                massage.append("鎴垮眿鍒濆鍖栨垚鍔熴��"+deleteFlagRoot+"銆�");
-            }
-            //涓氫富
-            int deleteFlagOwner = initializeOwnerInnerServiceSMOImpl.deleteBuildingOwner(communityIds);
-            if(deleteFlagOwner > 0){
-                massage.append("涓氫富鍒濆鍖栨垚鍔熴��"+deleteFlagOwner+"銆�");
-            }
-            //璐圭敤
-            int deleteFlagFee = initializePayFeeInnerServiceSMOImpl.deletePayFee(communityIds);
-            if(deleteFlagFee > 0){
-                massage.append("璐圭敤鍒濆鍖栨垚鍔熴��"+deleteFlagFee+"銆�");
-            }
-
-            //鍋滆溅鍦�
-            int deleteFlagArea = initializeBuildingUnitSMOImpl.deleteParkingArea(communityIds);
-            if(deleteFlagArea > 0){
-                massage.append("鍋滆溅鍦哄垵濮嬪寲鎴愬姛銆�"+deleteFlagArea+"銆�");
-            }
-            //鍋滆溅浣�
-            int deleteFlagSpace = initializeBuildingUnitSMOImpl.deleteParkingSpace(communityIds);
-            if(deleteFlagSpace > 0){
-                massage.append("鍋滆溅浣嶅垵濮嬪寲鎴愬姛銆�"+deleteFlagSpace+"銆�");
-            }
+        }else {
+            massage.append("鍗曞厓鍒濆鍖栧け璐�");
         }
+
+        Map communityIds = new HashMap<String,String []>();
+        communityIds.put("communityId",communityId);
+        //妤兼爧
+        int deleteFlag = initializeBuildingUnitSMOImpl.deletefFloor(communityIds);
+        if(deleteFlag > 0){
+            massage.append("妤兼爧鍒濆鍖栨垚鍔熴��"+deleteFlag+"銆�");
+        }else {
+            massage.append("妤兼爧鍒濆鍖栧け璐�");
+        }
+        //鎴垮眿
+        int deleteFlagRoot = initializeBuildingUnitSMOImpl.deleteBuildingRoom(communityIds);
+        if(deleteFlagRoot > 0){
+            massage.append("鎴垮眿鍒濆鍖栨垚鍔熴��"+deleteFlagRoot+"銆�");
+        }else {
+            massage.append("鎴垮眿鍒濆鍖栧け璐�");
+        }
+        //涓氫富
+        int deleteFlagOwner = initializeOwnerInnerServiceSMOImpl.deleteBuildingOwner(communityIds);
+        if(deleteFlagOwner > 0){
+            massage.append("涓氫富鍒濆鍖栨垚鍔熴��"+deleteFlagOwner+"銆�");
+        }else {
+            massage.append("涓氫富鍒濆鍖栧け璐�");
+        }
+        //璐圭敤
+        int deleteFlagFee = initializePayFeeInnerServiceSMOImpl.deletePayFee(communityIds);
+        if(deleteFlagFee > 0){
+            massage.append("璐圭敤鍒濆鍖栨垚鍔熴��"+deleteFlagFee+"銆�");
+        }else {
+            massage.append("璐圭敤鍒濆鍖栧け璐�");
+        }
+
+        //鍋滆溅鍦�
+        int deleteFlagArea = initializeBuildingUnitSMOImpl.deleteParkingArea(communityIds);
+        if(deleteFlagArea > 0){
+            massage.append("鍋滆溅鍦哄垵濮嬪寲鎴愬姛銆�"+deleteFlagArea+"銆�");
+        }else {
+            massage.append("鍋滆溅鍦哄垵濮嬪寲澶辫触");
+        }
+        //鍋滆溅浣�
+        int deleteFlagSpace = initializeBuildingUnitSMOImpl.deleteParkingSpace(communityIds);
+        if(deleteFlagSpace > 0){
+            massage.append("鍋滆溅浣嶅垵濮嬪寲鎴愬姛銆�"+deleteFlagSpace+"銆�");
+        }else {
+            massage.append("鍋滆溅浣嶅垵濮嬪寲澶辫触");
+        }
+
         return ResultVo.createResponseEntity(massage);
     }
 

--
Gitblit v1.8.0