From 6681665f66b71633182eec48597c952834843a1d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 一月 2026 17:06:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java
index 5b16ef0..142bd8b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java
@@ -73,10 +73,10 @@
}
-
LocalDate thisMonth = LocalDate.now().minusMonths(0).with(TemporalAdjusters.firstDayOfMonth());
Map<String, List<Record>> map = list.stream().collect(groupingBy(Record::getHierarchyName));
- List<ProjectHiddenDangerTrendVo> resultList = map.entrySet().stream().map(entry -> {
+ List<ProjectHiddenDangerTrendVo> resultList = new ArrayList<>();
+ for (Map.Entry<String, List<Record>> entry : map.entrySet()) {
ProjectHiddenDangerTrendVo vo = new ProjectHiddenDangerTrendVo();
vo.setName(entry.getKey());
List<Record> value = entry.getValue();
@@ -96,8 +96,8 @@
}else {
vo.setRate(0.00d);
}
- return vo;
- }).toList();
+ resultList.add(vo) ;
+ }
return resultList;
--
Gitblit v1.7.1