合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingTreeServiceImpl.java

@@ -449,10 +449,10 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			Info.eq("building_id",tpLevel.getBuildingId());
 			Info.eq("unit_id", tpLevel.getUnitId());
 			Info.eq("level_id", tpLevel.getId());
+			Info.eq("level_name", tpLevel.getName());
 			tpRoomNoMapper.delete(Info);
 			tpLevelMapper.deleteById(id);
 		}
-
 		//删除单元
 		if(type.equals("level")){
 			TpUnit tpUnit= tpUnitMapper.selectById(id);
@@ -465,7 +465,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			//删除单元-楼层-下的房间
 			//查询楼层ID
 			Integer tpLevelID=null;
-
 			List<TpLevel> levelevelList = tpLevelMapper.selectList(tpLevel);
 			for (TpLevel levelevel:levelevelList) {
 				QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
@@ -483,7 +482,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			tpLevelMapper.delete(tpLevel);
 			//删除此单元
 			tpUnitMapper.deleteById(id);
-
 		}
 		//删除楼栋
 		if (type.equals("unit")){
@@ -493,17 +491,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			tpUnit.eq("community_id", tpBuilding.getCommunityId());
 			tpUnit.eq("phase_id", tpBuilding.getPhaseId());
 			tpUnit.eq("building_id", tpBuilding.getId());
-			
-			//删除单元-楼层-下的房间
-			TpLevel tpLevelToo= tpLevelMapper.selectById(id);
-				QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
-			Info.eq("community_id", tpLevelToo.getCommunityId());
-			Info.eq("phase_id", tpLevelToo.getPhaseId());
-			Info.eq("building_id",tpLevelToo.getBuildingId());
-			Info.eq("unit_id", tpLevelToo.getUnitId());
-			Info.eq("level_id", tpLevelToo.getId());
-			//先删除所有房间
-			tpRoomNoMapper.delete(Info);
+			tpUnit.eq("building_name", tpBuilding.getName());
 			//先查询楼层
 			List<TpUnit> unitList= tpUnitMapper.selectList(tpUnit);
 			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
@@ -513,6 +501,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 					tpLevel.eq("community_id", unit.getCommunityId());
 					tpLevel.eq("building_id", unit.getBuildingId());
 					tpLevel.eq("unit_id", unit.getId());
+					tpLevel.eq("unit_name", unit.getName());
 					//查询房间
 					List<TpLevel> levelList= tpLevelMapper.selectList(tpLevel);
 					QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
@@ -523,12 +512,12 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 							tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
 							tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
 							tpRoomNoQueryWrapper.eq("level_id", level.getId());
+							tpRoomNoQueryWrapper.eq("level_name", level.getName());
 							//先删除所有房间
 							tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
 						}
 				}
 			}
-
 			}
 			//删除所有楼层
 			tpLevelMapper.delete(tpLevel);
@@ -537,52 +526,57 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			//删除栋
 			tpBuildingMapper.deleteById(id);
 		}
-
 		if (type.equals("building")){
 			TpPhase phase= tpPhaseMapper.selectById(id);
 
-			TpBuilding tpBuilding= tpBuildingMapper.selectById(phase.getId());
+			QueryWrapper<TpBuilding> building= new QueryWrapper<>();
+			building.eq("phase_id", phase.getId());
+			building.eq("community_id", phase.getCommunityId());
+			building.eq("name", phase.getName());
+			List<TpBuilding> tpBuildingList= tpBuildingMapper.selectList(building);
+			for (TpBuilding tpBuilding:tpBuildingList){
 			//删除单元-楼层-房间
 			QueryWrapper<TpUnit> tpUnit = new QueryWrapper<>();
+			List<TpUnit> unitList=null;
 			if (null!=tpBuilding) {
 				tpUnit.eq("community_id", tpBuilding.getCommunityId());
 				tpUnit.eq("phase_id", tpBuilding.getPhaseId());
 				tpUnit.eq("building_id", tpBuilding.getId());
+				tpUnit.eq("building_name", tpBuilding.getName());
+				unitList= tpUnitMapper.selectList(tpUnit);
 			}
 			//先查询楼层
-			List<TpUnit> unitList= tpUnitMapper.selectList(tpUnit);
 			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
 			if (null!=unitList) {
-				for (TpUnit unit:unitList) {
+				for (TpUnit unit : unitList) {
 					tpLevel.eq("phase_id", unit.getPhaseId());
 					tpLevel.eq("community_id", unit.getCommunityId());
 					tpLevel.eq("building_id", unit.getBuildingId());
 					tpLevel.eq("unit_id", unit.getId());
-
+					tpLevel.eq("unit_name", unit.getName());
 					//查询房间
-					List<TpLevel> levelList= tpLevelMapper.selectList(tpLevel);
-					if (null!=levelList) {
-						for (TpLevel level :levelList) {
+					List<TpLevel> levelList = tpLevelMapper.selectList(tpLevel);
+					if (null != levelList) {
+						for (TpLevel level : levelList) {
 							QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
 							tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
 							tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
 							tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
 							tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
 							tpRoomNoQueryWrapper.eq("level_id", level.getId());
+							tpRoomNoQueryWrapper.eq("level_name", level.getName());
 							//先删除所有房间
 							tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
 						}
-				}
+					}
 					//再删除所有楼层
 					tpLevelMapper.delete(tpLevel);
-			 }
+				}
 			}
 			//删除此单元
 			tpUnitMapper.delete(tpUnit);
+	}
 			//删除栋
-			QueryWrapper<TpBuilding> building= new QueryWrapper<>();
-			tpLevel.eq("phase_id", phase.getId());
-			tpLevel.eq("community_id", phase.getCommunityId());
 			tpBuildingMapper.delete(building);
 			//删除整个期
 			tpPhaseMapper.deleteById(id);

VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue

@@ -113,10 +113,10 @@ export default {
         console.log('error addNode')
       })
       },
-      suo(){
-        this.liste=[177,26,25]
-         console.log('1111'); 
-      },
+      // suo(){
+      //   this.liste=[177,26,25]
+      //    console.log('1111'); 
+      // },
       //删除当前节点
       remove(data){
       this.treeQuery.id = data.id
@@ -139,8 +139,6 @@ export default {
       if (node.level === 0) {
           return resolve(this.defaulData);
         }
-        
-        // var data = [];  
           this.treeQuery.treeType = node.data.type
           this.treeQuery.id = node.data.id
           this.BuildingTreeList(this.treeQuery).then(response => {
@@ -152,10 +150,6 @@ export default {
           }).catch(() => {
             console.log("get tree error");
           });
-
-        // setTimeout(() => {
-        //   resolve(data);
-        // }, 500);
     },
     dialogBatchImport() {
       this.$router.push({ name: 'building-batch-import' })