From 8d1d546ad729da0e809e17e8161376adcc662c96 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 11:51:36 +0800
Subject: [PATCH] update代码合并
---
admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java
index fccd6f6..c5aea16 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Comparator;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -141,7 +142,7 @@
info.put("类别", n.getName());
info.put("序号", index.getAndIncrement() + 1);
buildNode(info, n);
-
+
// 从fuzzyNode中获取评价
var fuzzyNode = getFuzzyNodeByPath(n.getPath());
if(fuzzyNode != null && fuzzyNode.getData() != null && fuzzyNode.getData().getRiskLevel() != null) {
@@ -182,7 +183,7 @@
var errors = new ArrayList<>();
// 按 problem.id 去重，相同问题只保留第一个记录
var nodeRecords = records.stream()
- .filter(record -> record.getProblem() != null &&
+ .filter(record -> record.getProblem() != null &&
record.getProblem().getHierarchyPath() != null &&
record.getProblem().getHierarchyPath().startsWith(suffix))
.collect(java.util.stream.Collectors.toMap(
@@ -190,8 +191,12 @@
record -> record,
(existing, replacement) -> existing // 保留第一个遇到的记录
))
- .values();
-
+ .values()
+ .stream()
+ // 按照record.errorLevel排序
+ .sorted(Comparator.comparing(ErrorRecord::getLevel, Comparator.nullsLast(Comparator.naturalOrder())))
+ .toList();
+
for(var record : nodeRecords){
var subItem = buildRecordDetail(record);
subItem.put("项目级别", errorNodeName(record));
--
Gitblit v1.7.1