From f49f89760fc68ab8cd0438955c412209e925e416 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 01 Nov 2023 14:58:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java |   64 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 0e12b3a..aff808e 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -16,24 +16,32 @@
  */
 package org.springblade.modules.doorplateAddress.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.common.node.TreeNode;
-import org.springblade.common.utils.NodeTreeUtil;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
 import org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper;
 import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
+import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
 import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
 import org.springblade.modules.doorplateAddress.vo.FuncNode;
+import org.springblade.modules.house.service.IHouseRentalService;
 import org.springblade.modules.house.service.IHouseholdLabelService;
 import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.vo.HouseRentalVO;
+import org.springblade.modules.house.vo.HouseholdVO;
 import org.springblade.modules.place.service.IPlaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -52,6 +60,9 @@
 
 	@Autowired
 	private IHouseholdService householdService;
+
+	@Autowired
+	private IHouseRentalService houseRentalService;
 
 
 	@Override
@@ -72,9 +83,9 @@
 			// 如果是网格管理员，系统管理员
 			if (type==1){
 				// 查询街道
-				List<TreeNode> townList = baseMapper.getRegionListByGrouyTwon();
+				List<TreeNode> townList = baseMapper.getRegionListByGroupTwon();
 				// 查询社区
-				List<TreeNode> neiList = baseMapper.getRegionListByGrouyNei();
+				List<TreeNode> neiList = baseMapper.getRegionListByGroupNei();
 				TreeNode node = townList.get(0);
 				node.setHasChildren(true);
 				// 遍历
@@ -159,4 +170,49 @@
 		// 返回
 		return list;
 	}
+
+	/**
+	 * 查询房屋及出租详情信息
+	 * @param code 门牌地址编号
+	 * @return
+	 */
+	@Override
+	public Object getHouseRentInfo(String code) {
+		// 先查询门牌信息
+		DoorplateAddressVO doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
+		if(null!= doorplateAddressDetailVO) {
+			// 查询房屋出租情况
+			List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
+			// 查询房屋人员情况
+			List<HouseholdVO> householdVOS = householdService.getHouseholdListByCode(code);
+			// 设置数据
+			doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
+			doorplateAddressDetailVO.setHouseholdList(householdVOS);
+		}
+		// 返回
+		return doorplateAddressDetailVO;
+	}
+
+	@Override
+	public List<DoorplateAddressVOTree> getDoorplateAddressList(String code, String type) {
+
+		//西市街道 万达社区 滨江西路66号 万达华府 26栋
+		List<DoorplateAddressVOTree> list = new ArrayList<>();
+
+
+		if (type.equals("townStreet")){
+			//获取所有街道街道
+			list = baseMapper.getTownStreetVOTreeList();
+		}else if (type.equals("nei")){
+			list= baseMapper.getNeiVOTreeList(code);
+		}else if (type.equals("streetRu")){
+			list = baseMapper.getStreetRuVOTreeList(code);
+		}else if (type.equals("district")){
+			list=baseMapper.getDistrictVOTreeList(code);
+		}else if (type.equals("building")){
+			list = baseMapper.getBuildingVOTreeList(code);
+		}
+
+		return list;
+	}
 }

--
Gitblit v1.9.3