Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

4 天以前 23cb707e9d6b716c8a5f9c79956845cf8df523c7

 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java

@@ -2430,6 +2430,10 @@
        dto.setProcessNum(sumQuantity(qualityInspectList, 1)); // 过程
        dto.setFactoryNum(sumQuantity(qualityInspectList, 2)); // 出厂

        // 假设 qualityInspectList 是一个 List<QualityInspect> 类型的集合
        Map<String, List<QualityInspect>> groupedByCheckResult = qualityInspectList.stream()
                .collect(Collectors.groupingBy(QualityInspect::getCheckResult));
        List<QualityInspect> qualityInspects = groupedByCheckResult.get("不合格");
        // 4. 处理图表项 (Item)
        List<QualityStatisticsItem> itemList = new ArrayList<>();

@@ -2439,7 +2443,7 @@
                        i -> i.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()));
        if (type == 3) {
            // 季度模式：按月分组
            Map<String, List<QualityInspect>> groupByMonth = qualityInspectList.stream()
            Map<String, List<QualityInspect>> groupByMonth = qualityInspects.stream()
                    .collect(Collectors.groupingBy(i -> {
                        LocalDate ld = dateMap.get(i);
                        return ld.format(DateTimeFormatter.ofPattern("yyyy-MM"));
@@ -2452,7 +2456,7 @@
            }
        } else {
            // 周或月模式：按天分组
            Map<String, List<QualityInspect>> groupByDay = qualityInspectList.stream()
            Map<String, List<QualityInspect>> groupByDay = qualityInspects.stream()
                    .collect(Collectors.groupingBy(i -> {
                        LocalDate ld = dateMap.get(i);
                        return ld.format(DateTimeFormatter.ofPattern("MM/dd"));