From b04d632b040e8b0426402794e6e71ee08e9f0379 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 28 Feb 2024 11:28:40 +0800
Subject: [PATCH] 标签统计

---
 src/main/java/org/springblade/common/node/TreeIntegerNode.java                     |    6 ++++++
 src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml           |    1 +
 src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java |    8 ++++++++
 3 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/common/node/TreeIntegerNode.java b/src/main/java/org/springblade/common/node/TreeIntegerNode.java
index f95b3de..ace10c7 100644
--- a/src/main/java/org/springblade/common/node/TreeIntegerNode.java
+++ b/src/main/java/org/springblade/common/node/TreeIntegerNode.java
@@ -26,6 +26,12 @@
 	private Integer id;
 
 	/**
+	 * 主键ID
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer ids;
+
+	/**
 	 * 名称
 	 */
 	private String name;
diff --git a/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml b/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml
index 41ed409..0167d02 100644
--- a/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml
+++ b/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml
@@ -61,6 +61,7 @@
     <select id="getTreeList" resultType="org.springblade.common.node.TreeIntegerNode">
         SELECT
             jc.category_no AS id,
+            jc.id AS ids,
             jc.category_no,
             jc.parent_no AS parentId,
             jc.category_name AS name,
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 3cb6a37..e97d833 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
@@ -515,6 +515,14 @@
 
 	private void recursion(TreeIntegerNode node) {
 		if (node.getChildren() != null && node.getChildren().size() > 0) {
+			if(node.getId().equals(1030)){
+				int sum = node.getChildren().stream().mapToInt(TreeIntegerNode::getCount).sum();
+				node.setCount(sum);
+			}
+			if(node.getId().equals(1031)){
+				int sum = node.getChildren().stream().mapToInt(TreeIntegerNode::getCount).sum();
+				node.setCount(sum);
+			}
 			node.getChildren().forEach(node2 -> recursion(node2));
 		} else {
 			node.setChildren(null);

--
Gitblit v1.9.3