From 38bd9b02ce6d784718d170a0d8d7a64629b0475e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 20 Dec 2023 18:05:08 +0800
Subject: [PATCH] 小区,房屋,人员,场所查询新增街道,社区,网格信息返回

---
 src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
index 2974ce4..928fbdf 100644
--- a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -25,6 +25,9 @@
 import org.springblade.modules.district.mapper.DistrictMapper;
 import org.springblade.modules.district.service.IDistrictService;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.grid.service.IGridService;
+import org.springblade.modules.grid.vo.GridVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -39,9 +42,28 @@
 @Service
 public class DistrictServiceImpl extends ServiceImpl<DistrictMapper, DistrictEntity> implements IDistrictService {
 
+	@Autowired
+	private IGridService gridService;
+
 	@Override
 	public IPage<DistrictVO> selectDistrictPage(IPage<DistrictVO> page, DistrictVO district) {
-		return page.setRecords(baseMapper.selectDistrictPage(page, district));
+		List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page, district);
+		// 遍历
+		for (DistrictVO districtVO : districtVOS) {
+			// 设置对应的网格名称
+			List<GridVO> gridVO = gridService.getGridListByAoiCode(districtVO.getAoiCode());
+			if (gridVO.size()>0) {
+				StringBuilder builder = new StringBuilder();
+				for (GridVO vo : gridVO) {
+					builder.append(vo.getGridName()).append(",");
+				}
+				String bui = builder.toString();
+				String substring = bui.substring(0, bui.length() - 1);
+				districtVO.setGridName(substring);
+			}
+		}
+		// 返回
+		return page.setRecords(districtVOS);
 	}
 
 	/**

--
Gitblit v1.9.3