From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index d73bf0d..c31c07d 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.house.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -330,7 +331,7 @@
public Integer statistics(Long userId, String neiCode, Integer confirmFlag) {
HouseholdVO householdVO = new HouseholdVO();
householdVO.setConfirmFlag(confirmFlag);
- householdVO.setNeiCode(neiCode);
+ householdVO.setCommunityCode(neiCode);
CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, householdVO);
return baseMapper.statistics(householdVO, commonParamSet.getIsAdministrator(),
@@ -581,4 +582,47 @@
node.setChildren(null);
}
}
+
+ /**
+ * 通过小区id查询用户
+ * @param householdVO
+ * @param page
+ * @return
+ */
+ @Override
+ public IPage<HouseholdVO> getUserInfoByDistrictIds(HouseholdVO householdVO, IPage<HouseholdVO> page) {
+ List<String> list = JSON.parseArray(householdVO.getDistrictIds()).toJavaList(String.class);
+ List<HouseholdVO> userInfoByDistrictIds = baseMapper.getUserInfoByDistrictIds(list, householdVO, page);
+ return page.setRecords(userInfoByDistrictIds);
+ }
+
+ /**
+ * 查询住户对应的社区编号
+ * @param id
+ * @return
+ */
+ @Override
+ public String getCommunityCode(Long id) {
+ return baseMapper.getCommunityCode(id);
+ }
+
+ /**
+ * 查询所有住户总数
+ * @return
+ */
+ @Override
+ public int getAllListTotal() {
+ return baseMapper.getAllListTotal();
+ }
+
+ /**
+ * 查询对应的住户集合
+ * @param i
+ * @param size
+ * @return
+ */
+ @Override
+ public List<HouseholdVO> getAllList(int i, int size) {
+ return baseMapper.getAllList(i,size);
+ }
}
--
Gitblit v1.9.3