From 88e10f5656a0ad5530a9e37892fb327153d9dc8a Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 27 六月 2025 13:25:35 +0800
Subject: [PATCH] feat(eims): 优化保养报表状态展示
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java
index ce7d9a2..2a5c4a6 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java
@@ -274,12 +274,23 @@
order -> String.valueOf(order.getPlanTime().toInstant()
.atZone(ZoneId.systemDefault())
.toLocalDate().getMonthValue()),
- // 鎸夋湀浠藉垎缁勫悗锛屽垽鏂鏈堟槸鍚﹀叏閮╯tatus=3
Collectors.collectingAndThen(
Collectors.toList(),
- orders -> orders.stream().allMatch(o -> o.getStatus().equals("3"))
- ? "宸插畬鎴�"
- : "鏈畬鎴�"
+ orders -> {
+ boolean allZero = orders.stream().allMatch(o -> o.getStatus().equals("0"));
+ if (allZero) {
+ return MAINT_0; // 寰呬繚鍏�
+ }
+ boolean allGtOne = orders.stream().allMatch(o -> Integer.parseInt(o.getStatus()) > 1);
+ if (allGtOne) {
+ return MAINT_2; // 寰呴獙璇�
+ }
+ boolean allGtTwo = orders.stream().allMatch(o -> Integer.parseInt(o.getStatus()) > 2);
+ if (allGtTwo) {
+ return MAINT_3; // 宸插畬鎴�
+ }
+ return "淇濆吇涓�";
+ }
)
));
Map<String, EimsMaintPlan> planMap = equMaintPlanList.stream()
@@ -295,7 +306,7 @@
for (int month = 1; month <= monthInYear; month++) {
String monthKey = "month_" + month;
if (planMap.containsKey(String.valueOf(month))) {
- item.put(monthKey, UNCHECKED);
+ item.put(monthKey, MAINT_0);
} else if (orderMap.containsKey(String.valueOf(month))) {
String result = orderMap.get(String.valueOf(month));
item.put(monthKey, result);
--
Gitblit v1.9.3