From 88a23e7830c34092f347c87cf55e27644078bd8b Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 03 三月 2026 15:06:59 +0800
Subject: [PATCH] fix:委托方项目等级计算问题修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
index 52d76bc..f94fd8f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
@@ -311,7 +311,7 @@
// 计算安全检查平均分
double avgSafetyScore = results.stream()
- .filter(e -> e.getScore() != null)
+ .filter(e -> e.getContainSystemRes() != null && e.getContainSystemRes().equals(Boolean.TRUE))
.mapToDouble(EvalResult::getScore)
.average()
.orElse(0.0);
@@ -320,7 +320,7 @@
// 计算设备检查平均分（需要解析 device_res_map）
List<Float> deviceScores = results.stream()
- .filter(e -> StringUtils.hasText(e.getDeviceResMap()))
+ .filter(e -> e.getContainDeviceRes() != null && e.getContainDeviceRes().equals(Boolean.TRUE))
.map(e -> calculateDeviceScore(e.getDeviceResMap()))
.filter(score -> score != null && score > 0)
.toList();
--
Gitblit v1.7.1