车间能级提升-智能设备管理系统
baoshiwei
2025-06-27 88e10f5656a0ad5530a9e37892fb327153d9dc8a
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()),
                // 按月份分组后,判断该月是否全部status=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);