From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 fea8dc3..90d0d88 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
@@ -22,7 +22,9 @@
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.node.TreeIntegerNode;
import org.springblade.common.node.TreeStringNode;
+import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
@@ -481,15 +483,15 @@
@Override
public IPage<HouseholdVO> getKeynotePersonnelPage(IPage<HouseholdVO> page, HouseholdVO household) {
- StopWatch stopWatch = new StopWatch();
- stopWatch.start();
-// Dept dept = deptService.getById(AuthUtil.getDeptId());
-// if (null!=dept){
-// household.setRegionCode(dept.getRegionCode());
-// }
+ // StopWatch stopWatch = new StopWatch();
+ // stopWatch.start();
+ // Dept dept = deptService.getById(AuthUtil.getDeptId());
+ // if (null!=dept){
+ // household.setRegionCode(dept.getRegionCode());
+ // }
List<HouseholdVO> householdVOS = baseMapper.getKeynotePersonnelPage(page, household);
- stopWatch.stop();
- System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
+ // stopWatch.stop();
+ // System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
return page.setRecords(householdVOS);
}
@@ -502,4 +504,20 @@
public List<HouseholdVO> getHouseholdListByParam(List<Integer> list) {
return baseMapper.getHouseholdListByParam(list);
}
+
+ @Override
+ public List<TreeIntegerNode> getlabelStatistics(HouseholdVO household) {
+ Map<Integer, TreeIntegerNode> labelTreeList = baseMapper.getlabelStatistics(household);
+ List<TreeIntegerNode> nodeTree = NodeTreeUtil.getNodeTree(labelTreeList);
+ nodeTree.forEach(node -> recursion(node));
+ return nodeTree;
+ }
+
+ private void recursion(TreeIntegerNode node) {
+ if (node.getChildren() != null && node.getChildren().size() > 0) {
+ node.getChildren().forEach(node2 -> recursion(node2));
+ } else {
+ node.setChildren(null);
+ }
+ }
}
--
Gitblit v1.9.3