From 564605ec874803247beb7ba48ec256cd9a4cb83f Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 03 三月 2026 16:28:58 +0800
Subject: [PATCH] fix:委托方固定资产项目等级计算问题修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 f94fd8f..1c561c0 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
@@ -198,7 +198,10 @@
List<Record> hazardRecords = recordMapper.selectList(recordWrapper);
if (hazardRecords.isEmpty()) {
- log.info("项目没有隐患记录，projectIds: {}", projectIds);
+ log.info("项目没有隐患记录，所有项目归类为 A，projectIds: {}", projectIds);
+ for (Integer projectId : projectIds) {
+ categoryMap.put(projectId, "A");
+ }
return categoryMap;
}
@@ -522,8 +525,8 @@
return null;
}
- // 按优先级顺序判断：A -> B -> C
- String[] categories = {"a", "b", "c"};
+ // 按优先级顺序判断：C -> B，都不满足则归类为 A
+ String[] categories = {"c", "b"};
for (String category : categories) {
JSONArray categoryRules = config.getJSONArray(category);
@@ -571,10 +574,10 @@
}
if (matchesCategory) {
- return category.toUpperCase(); // 返回 "A", "B", "C"
+ return category.toUpperCase(); // 返回 "C" 或 "B"
}
}
- return null; // 不满足任何类别
+ return "A"; // 不满足 C 和 B，直接归类为 A
}
}
--
Gitblit v1.7.1