From 9ef0470945cd16a9ed8d2c80088e9a52159dddee Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 05 Dec 2023 10:41:47 +0800
Subject: [PATCH] 修改网格表的userId
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 5f54f07..d86a864 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
@@ -24,6 +24,7 @@
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
+import org.springblade.common.utils.ComplexNumberStringComparator;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.category.dto.CategoryLabelDTO;
@@ -37,7 +38,9 @@
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.FuncNode;
import org.springblade.modules.grid.entity.GridEntity;
+import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
+import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseService;
@@ -47,6 +50,8 @@
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.system.entity.Region;
+import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -77,6 +82,12 @@
@Autowired
private IGridService gridService;
+
+ @Autowired
+ private IGridmanService gridmanService;
+
+ @Autowired
+ private IRegionService regionService;
@Autowired
private IDistrictService districtService;
@@ -236,14 +247,17 @@
*/
private void getGridInfoByGridman(HouseParam houseParam) {
if (houseParam.getRoleName().equals("网格员")) {
- QueryWrapper<GridEntity> wrapper = new QueryWrapper<>();
+ QueryWrapper<GridmanEntity> wrapper = new QueryWrapper<>();
wrapper.eq("is_deleted", 0)
.eq("user_id", AuthUtil.getUserId());
- List<GridEntity> list = gridService.list(wrapper);
+ List<GridmanEntity> list = gridmanService.list(wrapper);
if (list.size() > 0) {
- GridEntity gridEntity = list.get(0);
- if (!Strings.isBlank(gridEntity.getCommunityName())) {
- houseParam.setCommunityName(gridEntity.getCommunityName().split("居民委员会")[0]);
+ GridmanEntity gridmanEntity = list.get(0);
+ GridEntity gridEntity = gridService.getById(gridmanEntity.getGridId());
+ // 查询居委会
+ Region region = regionService.getById(gridEntity.getCommunityCode());
+ if (null != region) {
+ houseParam.setCommunityName(region.getName());
}
if (!Strings.isBlank(gridEntity.getGridName())) {
houseParam.setGridName(gridEntity.getGridName());
@@ -325,10 +339,15 @@
List<TreeStringNode> aoiList = new ArrayList<>();
List<TreeStringNode> shopList = new ArrayList<>();
// 根据社区名称查询楼栋或者商铺的集合
-
List<TreeStringNode> list = baseMapper.getBuildingList(houseParam, stringList);
// 排序 StringUtils.getDigits(X.getName()) 取出数字排序
- List<TreeStringNode> sortList = list.stream().sorted(Comparator.comparing(X -> StringUtils.getDigits(X.getName()))).collect(Collectors.toList());
+ List<TreeStringNode> sortList = list.stream().
+ sorted(new Comparator<TreeStringNode>() {
+ @Override
+ public int compare(TreeStringNode o1, TreeStringNode o2) {
+ return ComplexNumberStringComparator.compare(o1.getName(),o2.getName());
+ }
+ }).collect(Collectors.toList());
if (list.size() > 0) {
for (TreeStringNode treeNode : sortList) {
if (treeNode.getAddressType() == 1) {
--
Gitblit v1.9.3