PC端：抽问抽答完成趋势对比+错题分析接口（美兰）

1. DailyExamComparisonController：调整返回结构
   - 改为返回当前周期时间序列趋势数据（同completion-trend）
   - 每条series附加yoyRate（同比）和chainRatio（环比）字段
   - 适配4级架构：STATION→各大队；BRIGADE→各主管

2. 新增DailyExamWrongAnalysisPcController：
   - /wrong-analysis/pc-overview：支持scopeType/scopeId统计范围参数
   - /wrong-analysis/pc-radar：支持scopeType/scopeId，按范围展示不同粒度series
   - STATION→各大队；BRIGADE→各主管；MANAGER/USER→单条

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/DailyExamComparisonController.java

@@ -21,17 +21,21 @@ import org.springframework.web.bind.annotation.RestController;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.Date;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 抽问抽答完成趋势对比接口（美兰4级架构）
- * STATION > 大队(BRIGADE) > 主管(MANAGER) > 班组
- * 始终返回多期聚合对比数据：
- *   YEAR：[去年, 今年] 含同比(yoyRate)
- *   QUARTER：[去年同季度, 上季度, 本季度] 含同比+环比(chainRatio)
- *   MONTH：[去年同月, 上月, 本月] 含同比+环比
+ * 抽问抽答完成趋势对比接口（PC管理端，美兰4级架构）
+ * STATION（安检站）> BRIGADE（大队）> MANAGER（主管）> 班组
+ *
+ * 返回当前周期的时间序列趋势数据（同 /completion-trend），
+ * 同时在每条 series 上附加 yoyRate（同比）和 chainRatio（环比）。
+ *
+ * yoyRate  = (本期总数 - 去年同期总数) / 去年同期总数 × 100
+ * chainRatio = (本期总数 - 上期总数) / 上期总数 × 100（仅 QUARTER/MONTH）
  */
 @RestController
 @RequestMapping("/v1/cs/app/daily-exam")
@@ -79,7 +83,6 @@ public class DailyExamComparisonController {
                     || roleKeys.contains(RoleTypeEnum.xingzheng.getCode()));
             boolean isManager = !isStation && !isBrigade && roleKeys.contains(RoleTypeEnum.kezhang.getCode());
 
-            // 班组长及以下不显示（未传 scopeType 且无管理权限）
             if (scopeType == null && !isStation && !isBrigade && !isManager) {
                 Map<String, Object> noShow = new HashMap<>();
                 noShow.put("show", false);
@@ -90,16 +93,24 @@ public class DailyExamComparisonController {
             int curQuarter = (quarter != null) ? quarter : ((LocalDate.now().getMonthValue() - 1) / 3 + 1);
             int curMonth = (month != null) ? month : LocalDate.now().getMonthValue();
 
-            List<LocalDate[]> periods = buildPeriods(dateRangeQueryType, curYear, curQuarter, curMonth);
-            List<String> xAxis = buildXAxisLabels(dateRangeQueryType, curYear, curQuarter, curMonth);
+            // 当前周期
+            LocalDate[] currentRange = resolveDateRange(dateRangeQueryType, curYear, curQuarter, curMonth);
+            // 去年同期（用于计算同比）
+            LocalDate[] yoyRange = resolveDateRange(dateRangeQueryType, curYear - 1, curQuarter, curMonth);
+            // 上一期（用于计算环比，仅 QUARTER/MONTH）
+            LocalDate[] prevRange = buildPrevRange(dateRangeQueryType, curYear, curQuarter, curMonth);
+
+            boolean byMonth = "YEAR".equals(dateRangeQueryType);
+            List<String> xAxis = buildXAxis(currentRange[0], currentRange[1], byMonth);
+
+            List<Map<String, Object>> series = buildComparisonSeries(
+                    scopeType, scopeId, xAxis, currentRange, yoyRange, prevRange,
+                    byMonth, isStation, isBrigade, isManager, userDeptId, loginUser);
 
             Map<String, Object> result = new LinkedHashMap<>();
             result.put("show", true);
             result.put("xAxis", xAxis);
-            result.put("series", buildComparisonSeries(
-                    scopeType, scopeId, periods, dateRangeQueryType,
-                    isStation, isBrigade, isManager, userDeptId, loginUser));
-
+            result.put("series", series);
             return HttpResult.success(result);
 
         } catch (Exception e) {
@@ -109,134 +120,84 @@ public class DailyExamComparisonController {
     }
 
     /**
-     * 构建各期日期范围列表
-     * YEAR：[去年, 今年]
-     * QUARTER：[去年同季度, 上季度, 本季度]
-     * MONTH：[去年同月, 上月, 本月]
+     * 计算上一期日期范围（QUARTER/MONTH）；YEAR 返回 null（无环比）
      */
-    private List<LocalDate[]> buildPeriods(String type, int year, int quarter, int month) {
-        List<LocalDate[]> periods = new ArrayList<>();
-        switch (type == null ? "MONTH" : type) {
-            case "YEAR":
-                periods.add(new LocalDate[]{LocalDate.of(year - 1, 1, 1), LocalDate.of(year - 1, 12, 31)});
-                periods.add(new LocalDate[]{LocalDate.of(year, 1, 1), LocalDate.of(year, 12, 31)});
-                break;
-            case "QUARTER":
-                periods.add(resolveDateRange("QUARTER", year - 1, quarter, null));
-                int prevQ = quarter - 1;
-                int prevQYear = year;
-                if (prevQ < 1) { prevQ = 4; prevQYear = year - 1; }
-                periods.add(resolveDateRange("QUARTER", prevQYear, prevQ, null));
-                periods.add(resolveDateRange("QUARTER", year, quarter, null));
-                break;
-            case "MONTH":
-            default:
-                periods.add(resolveDateRange("MONTH", year - 1, null, month));
-                int prevM = month - 1;
-                int prevMYear = year;
-                if (prevM < 1) { prevM = 12; prevMYear = year - 1; }
-                periods.add(resolveDateRange("MONTH", prevMYear, null, prevM));
-                periods.add(resolveDateRange("MONTH", year, null, month));
-                break;
+    private LocalDate[] buildPrevRange(String type, int year, int quarter, int month) {
+        if ("YEAR".equals(type)) return null;
+        if ("QUARTER".equals(type)) {
+            int prevQ = quarter - 1;
+            int prevYear = year;
+            if (prevQ < 1) { prevQ = 4; prevYear = year - 1; }
+            return resolveDateRange("QUARTER", prevYear, prevQ, month);
         }
-        return periods;
+        // MONTH
+        int prevM = month - 1;
+        int prevYear = year;
+        if (prevM < 1) { prevM = 12; prevYear = year - 1; }
+        return resolveDateRange("MONTH", prevYear, quarter, prevM);
     }
 
     /**
-     * 构建 X 轴中文标签列表
-     */
-    private List<String> buildXAxisLabels(String type, int year, int quarter, int month) {
-        List<String> labels = new ArrayList<>();
-        switch (type == null ? "MONTH" : type) {
-            case "YEAR":
-                labels.add((year - 1) + "年");
-                labels.add(year + "年");
-                break;
-            case "QUARTER":
-                labels.add((year - 1) + "年第" + quarter + "季度");
-                int prevQ = quarter - 1;
-                int prevQYear = year;
-                if (prevQ < 1) { prevQ = 4; prevQYear = year - 1; }
-                labels.add(prevQYear + "年第" + prevQ + "季度");
-                labels.add(year + "年第" + quarter + "季度");
-                break;
-            case "MONTH":
-            default:
-                labels.add((year - 1) + "年" + month + "月");
-                int prevM = month - 1;
-                int prevMYear = year;
-                if (prevM < 1) { prevM = 12; prevMYear = year - 1; }
-                labels.add(prevMYear + "年" + prevM + "月");
-                labels.add(year + "年" + month + "月");
-                break;
-        }
-        return labels;
-    }
-
-    /**
-     * 构建多期对比 series 列表（适配美兰4级架构）
-     * STATION：各大队各一条 series + 全站汇总
-     * BRIGADE：该大队各主管各一条 series
-     * MANAGER/USER：单条 series
+     * 构建 series 列表：每条 series 含当前周期趋势数据 + yoyRate + chainRatio
      */
     private List<Map<String, Object>> buildComparisonSeries(
-            String scopeType, Long scopeId, List<LocalDate[]> periods, String dateRangeQueryType,
-            boolean isStation, boolean isBrigade, boolean isManager, Long userDeptId, LoginUser loginUser) {
-
-        boolean isYearType = "YEAR".equals(dateRangeQueryType);
+            String scopeType, Long scopeId,
+            List<String> xAxis, LocalDate[] currentRange, LocalDate[] yoyRange, LocalDate[] prevRange,
+            boolean byMonth, boolean isStation, boolean isBrigade, boolean isManager,
+            Long userDeptId, LoginUser loginUser) {
 
         if ("MANAGER".equals(scopeType) && scopeId != null) {
-            String name = "主管" + scopeId;
-            List<Integer> data = new ArrayList<>();
-            for (LocalDate[] p : periods) {
-                List<DailyTask> tasks = queryTasksByDepartmentId(scopeId, p[0], p[1]);
-                if (name.startsWith("主管")) {
-                    name = tasks.stream().map(DailyTask::getDtDepartmentName)
-                            .filter(Objects::nonNull).findFirst().orElse(name);
-                }
-                data.add(countCompleted(tasks));
-            }
-            return Collections.singletonList(buildSeriesItem(name, scopeId, null, data, isYearType));
+            List<DailyTask> current = queryTasksByDepartmentId(scopeId, currentRange[0], currentRange[1]);
+            String name = current.stream().map(DailyTask::getDtDepartmentName)
+                    .filter(Objects::nonNull).findFirst().orElse("主管" + scopeId);
+            int yoyCount = countCompleted(queryTasksByDepartmentId(scopeId, yoyRange[0], yoyRange[1]));
+            Integer prevCount = prevRange != null
+                    ? countCompleted(queryTasksByDepartmentId(scopeId, prevRange[0], prevRange[1])) : null;
+            return Collections.singletonList(
+                    buildSeriesItem(name, scopeId, null, xAxis, current, byMonth, yoyCount, prevCount));
 
         } else if ("USER".equals(scopeType) && scopeId != null) {
-            String name = "用户" + scopeId;
-            List<Integer> data = new ArrayList<>();
-            for (LocalDate[] p : periods) {
-                List<DailyTask> tasks = queryTasksByUserId(scopeId, p[0], p[1]);
-                if (name.startsWith("用户")) {
-                    name = tasks.stream().map(DailyTask::getDtUserName)
-                            .filter(Objects::nonNull).findFirst().orElse(name);
-                }
-                data.add(countCompleted(tasks));
-            }
-            return Collections.singletonList(buildSeriesItem(name, null, scopeId, data, isYearType));
+            List<DailyTask> current = queryTasksByUserId(scopeId, currentRange[0], currentRange[1]);
+            String name = current.stream().map(DailyTask::getDtUserName)
+                    .filter(Objects::nonNull).findFirst().orElse("用户" + scopeId);
+            int yoyCount = countCompleted(queryTasksByUserId(scopeId, yoyRange[0], yoyRange[1]));
+            Integer prevCount = prevRange != null
+                    ? countCompleted(queryTasksByUserId(scopeId, prevRange[0], prevRange[1])) : null;
+            return Collections.singletonList(
+                    buildSeriesItem(name, null, scopeId, xAxis, current, byMonth, yoyCount, prevCount));
 
         } else if ("BRIGADE".equals(scopeType) && scopeId != null) {
-            return buildBrigadeSeries(scopeId, periods, isYearType);
+            return buildBrigadeSeries(scopeId, xAxis, currentRange, yoyRange, prevRange, byMonth);
 
         } else {
             Long stationDeptId = ("STATION".equals(scopeType) && scopeId != null) ? scopeId : userDeptId;
             if (isStation || "STATION".equals(scopeType)) {
-                return buildStationSeries(stationDeptId, periods, isYearType);
+                return buildStationSeries(stationDeptId, xAxis, currentRange, yoyRange, prevRange, byMonth);
             } else if (isBrigade) {
-                return buildBrigadeSeries(userDeptId, periods, isYearType);
+                return buildBrigadeSeries(userDeptId, xAxis, currentRange, yoyRange, prevRange, byMonth);
             } else {
                 // 主管：单条 series
                 String deptName = loginUser.getUser().getDept() != null
                         ? loginUser.getUser().getDept().getDeptName() : "本主管";
-                List<Integer> data = new ArrayList<>();
-                for (LocalDate[] p : periods) {
-                    data.add(countCompleted(queryTasksByDepartmentId(userDeptId, p[0], p[1])));
-                }
-                return Collections.singletonList(buildSeriesItem(deptName, userDeptId, null, data, isYearType));
+                List<DailyTask> current = queryTasksByDepartmentId(userDeptId, currentRange[0], currentRange[1]);
+                int yoyCount = countCompleted(queryTasksByDepartmentId(userDeptId, yoyRange[0], yoyRange[1]));
+                Integer prevCount = prevRange != null
+                        ? countCompleted(queryTasksByDepartmentId(userDeptId, prevRange[0], prevRange[1])) : null;
+                return Collections.singletonList(
+                        buildSeriesItem(deptName, userDeptId, null, xAxis, current, byMonth, yoyCount, prevCount));
             }
         }
     }
 
     /**
-     * 站长视角：按大队分组，各期聚合 + 全站汇总
+     * 站长视角：按大队分组，各大队各一条 series + 全站汇总
      */
-    private List<Map<String, Object>> buildStationSeries(Long stationDeptId, List<LocalDate[]> periods, boolean isYearType) {
+    private List<Map<String, Object>> buildStationSeries(Long stationDeptId,
+                                                          List<String> xAxis,
+                                                          LocalDate[] currentRange,
+                                                          LocalDate[] yoyRange,
+                                                          LocalDate[] prevRange,
+                                                          boolean byMonth) {
         List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(stationDeptId);
         if (subDepts == null) subDepts = Collections.emptyList();
 
@@ -245,51 +206,42 @@ public class DailyExamComparisonController {
                 .filter(d -> stationDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
                 .collect(Collectors.toList());
 
-        // 主管deptId -> 所属大队deptId
-        Map<Long, Long> managerToBrigadeId = new HashMap<>();
-        for (SysDept d : subDepts) {
-            if ("0".equals(d.getDelFlag()) && d.getParentId() != null && !stationDeptId.equals(d.getParentId())) {
-                managerToBrigadeId.put(d.getDeptId(), d.getParentId());
-            }
-        }
-
-        Set<Long> allDeptIds = new HashSet<>();
-        allDeptIds.add(stationDeptId);
-        subDepts.forEach(d -> allDeptIds.add(d.getDeptId()));
-
-        List<List<DailyTask>> periodTasks = new ArrayList<>();
-        for (LocalDate[] p : periods) {
-            periodTasks.add(queryTasksByDeptIds(allDeptIds, p[0], p[1]));
-        }
-
         List<Map<String, Object>> series = new ArrayList<>();
-        List<Integer> totalData = new ArrayList<>();
-        for (int i = 0; i < periods.size(); i++) totalData.add(0);
+        List<DailyTask> stationCurrentAll = new ArrayList<>();
+        int stationYoyTotal = 0;
+        int stationPrevTotal = 0;
 
         for (SysDept brigade : brigadeDepts) {
-            Long brigadeId = brigade.getDeptId();
-            List<Integer> data = new ArrayList<>();
-            for (int i = 0; i < periodTasks.size(); i++) {
-                int count = countCompleted(periodTasks.get(i).stream()
-                        .filter(t -> {
-                            Long managerId = t.getDtDepartmentId();
-                            if (managerId == null) return false;
-                            return brigadeId.equals(managerToBrigadeId.get(managerId));
-                        })
-                        .collect(Collectors.toList()));
-                data.add(count);
-                totalData.set(i, totalData.get(i) + count);
-            }
-            series.add(buildSeriesItem(brigade.getDeptName(), brigadeId, null, data, isYearType));
+            List<DailyTask> current = queryTasksByBrigadeId(brigade.getDeptId(), currentRange[0], currentRange[1]);
+            int yoyCount = countCompletedByBrigadeId(brigade.getDeptId(), yoyRange[0], yoyRange[1]);
+            int prevCount = prevRange != null
+                    ? countCompletedByBrigadeId(brigade.getDeptId(), prevRange[0], prevRange[1]) : 0;
+
+            stationCurrentAll.addAll(current);
+            stationYoyTotal += yoyCount;
+            stationPrevTotal += prevCount;
+
+            series.add(buildSeriesItem(brigade.getDeptName(), brigade.getDeptId(), null,
+                    xAxis, current, byMonth, yoyCount, prevRange != null ? prevCount : null));
         }
-        series.add(buildSeriesItem("全站", null, null, totalData, isYearType));
+
+        // 全站汇总 series
+        int finalYoyTotal = stationYoyTotal;
+        Integer finalPrevTotal = prevRange != null ? stationPrevTotal : null;
+        series.add(buildSeriesItem("全站", null, null, xAxis, stationCurrentAll, byMonth,
+                finalYoyTotal, finalPrevTotal));
         return series;
     }
 
     /**
-     * 大队视角：按主管分组，各期聚合
+     * 大队视角：按主管分组，各主管各一条 series
      */
-    private List<Map<String, Object>> buildBrigadeSeries(Long brigadeId, List<LocalDate[]> periods, boolean isYearType) {
+    private List<Map<String, Object>> buildBrigadeSeries(Long brigadeId,
+                                                          List<String> xAxis,
+                                                          LocalDate[] currentRange,
+                                                          LocalDate[] yoyRange,
+                                                          LocalDate[] prevRange,
+                                                          boolean byMonth) {
         List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(brigadeId);
         if (subDepts == null) subDepts = Collections.emptyList();
 
@@ -299,40 +251,76 @@ public class DailyExamComparisonController {
 
         List<Map<String, Object>> series = new ArrayList<>();
         for (SysDept manager : managerDepts) {
-            List<Integer> data = new ArrayList<>();
-            for (LocalDate[] p : periods) {
-                data.add(countCompleted(queryTasksByDepartmentId(manager.getDeptId(), p[0], p[1])));
-            }
-            series.add(buildSeriesItem(manager.getDeptName(), manager.getDeptId(), null, data, isYearType));
+            List<DailyTask> current = queryTasksByDepartmentId(manager.getDeptId(), currentRange[0], currentRange[1]);
+            int yoyCount = countCompleted(queryTasksByDepartmentId(manager.getDeptId(), yoyRange[0], yoyRange[1]));
+            Integer prevCount = prevRange != null
+                    ? countCompleted(queryTasksByDepartmentId(manager.getDeptId(), prevRange[0], prevRange[1])) : null;
+            series.add(buildSeriesItem(manager.getDeptName(), manager.getDeptId(), null,
+                    xAxis, current, byMonth, yoyCount, prevCount));
         }
         return series;
     }
 
     /**
-     * 构建单条 series map，含同比/环比
-     * data[0]=去年同期，data[1]=上期(仅QUARTER/MONTH)，data[last]=本期
+     * 构建单条 series：趋势数据来自当前周期，yoyRate/chainRatio 由聚合总数计算
      */
     private Map<String, Object> buildSeriesItem(String name, Long deptId, Long userId,
-                                                 List<Integer> data, boolean isYearType) {
+                                                 List<String> xAxis, List<DailyTask> currentTasks,
+                                                 boolean byMonth, int yoyBaseCount, Integer prevCount) {
+        List<Integer> data = buildSeriesData(xAxis, currentTasks, byMonth);
+        int currentTotal = data.stream().mapToInt(Integer::intValue).sum();
+
         Map<String, Object> s = new LinkedHashMap<>();
         s.put("name", name);
         if (deptId != null) s.put("deptId", deptId);
         if (userId != null) s.put("userId", userId);
         s.put("data", data);
-        int current = data.get(data.size() - 1);
-        // 同比：本期 vs 去年同期（data[0]）
-        s.put("yoyRate", calcRate(current, data.get(0)));
-        // 环比：本期 vs 上一期（data[last-1]），仅 QUARTER/MONTH 有效
-        if (!isYearType && data.size() >= 3) {
-            s.put("chainRatio", calcRate(current, data.get(data.size() - 2)));
+        s.put("yoyRate", calcRate(currentTotal, yoyBaseCount));
+        s.put("chainRatio", prevCount != null ? calcRate(currentTotal, prevCount) : null);
+        return s;
+    }
+
+    /**
+     * 将任务列表按时间维度汇聚，对齐到 xAxis
+     */
+    private List<Integer> buildSeriesData(List<String> xAxis, List<DailyTask> tasks, boolean byMonth) {
+        SimpleDateFormat sdf = new SimpleDateFormat(byMonth ? "yyyy-MM" : "yyyy-MM-dd");
+        Map<String, Long> countMap = tasks.stream()
+                .filter(t -> "COMPLETED".equals(t.getDtStatus()) && t.getDtBusinessDate() != null)
+                .collect(Collectors.groupingBy(
+                        t -> sdf.format(t.getDtBusinessDate()),
+                        Collectors.counting()));
+        List<Integer> result = new ArrayList<>();
+        for (String label : xAxis) {
+            result.add(countMap.getOrDefault(label, 0L).intValue());
+        }
+        return result;
+    }
+
+    /**
+     * 生成 X 轴标签：YEAR→每月(yyyy-MM)；QUARTER/MONTH→每天(yyyy-MM-dd)
+     */
+    private List<String> buildXAxis(LocalDate start, LocalDate end, boolean byMonth) {
+        List<String> xAxis = new ArrayList<>();
+        if (byMonth) {
+            LocalDate cursor = start.withDayOfMonth(1);
+            LocalDate endMonth = end.withDayOfMonth(1);
+            while (!cursor.isAfter(endMonth)) {
+                xAxis.add(cursor.format(DateTimeFormatter.ofPattern("yyyy-MM")));
+                cursor = cursor.plusMonths(1);
+            }
         } else {
-            s.put("chainRatio", null);
+            LocalDate cursor = start;
+            while (!cursor.isAfter(end)) {
+                xAxis.add(cursor.toString());
+                cursor = cursor.plusDays(1);
+            }
         }
-        return s;
+        return xAxis;
     }
 
     /**
-     * 计算变化率百分比，base=0 时返回 null
+     * 计算变化率百分比；base=0 时返回 null
      */
     private BigDecimal calcRate(int current, int base) {
         if (base == 0) return null;
@@ -341,16 +329,33 @@ public class DailyExamComparisonController {
                 .divide(BigDecimal.valueOf(base), 2, RoundingMode.HALF_UP);
     }
 
-    /**
-     * 统计 COMPLETED 任务数
-     */
     private int countCompleted(List<DailyTask> tasks) {
         return (int) tasks.stream().filter(t -> "COMPLETED".equals(t.getDtStatus())).count();
     }
 
     /**
-     * 根据 type/year/quarter/month 计算起止日期
+     * 查询大队下所有主管的任务（通过大队子部门的 dtDepartmentId）
      */
+    private List<DailyTask> queryTasksByBrigadeId(Long brigadeId, LocalDate start, LocalDate end) {
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(brigadeId);
+        if (subDepts == null) subDepts = Collections.emptyList();
+        Set<Long> managerIds = subDepts.stream()
+                .filter(d -> brigadeId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                .map(SysDept::getDeptId)
+                .collect(Collectors.toSet());
+        if (managerIds.isEmpty()) return Collections.emptyList();
+        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(DailyTask::getDtDepartmentId, managerIds);
+        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        wrapper.eq(DailyTask::getDelStatus, 0);
+        return dailyTaskMapper.selectList(wrapper);
+    }
+
+    private int countCompletedByBrigadeId(Long brigadeId, LocalDate start, LocalDate end) {
+        return countCompleted(queryTasksByBrigadeId(brigadeId, start, end));
+    }
+
     private LocalDate[] resolveDateRange(String type, Integer year, Integer quarter, Integer month) {
         LocalDate today = LocalDate.now();
         int y = (year != null) ? year : today.getYear();

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/DailyExamWrongAnalysisPcController.java

@@ -0,0 +1,542 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.service.QuesCatService;
+import com.sundot.airport.exam.domain.DailyTask;
+import com.sundot.airport.exam.domain.DailyTaskDetail;
+import com.sundot.airport.exam.domain.QuesCat;
+import com.sundot.airport.exam.mapper.DailyTaskDetailMapper;
+import com.sundot.airport.exam.mapper.DailyTaskMapper;
+import com.sundot.airport.system.domain.BaseCheckCategory;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.service.IBaseCheckCategoryService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.Date;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 抽问抽答错题分析 PC管理端接口（美兰4级架构）
+ * 美兰组织架构：STATION（安检站）> BRIGADE（大队）> MANAGER（主管）> 班组
+ *
+ * 接口1: GET /wrong-analysis/pc-overview  总体问题分布（饼图），支持 scopeType/scopeId
+ * 接口2: GET /wrong-analysis/pc-radar     问题分布对比（雷达图），支持 scopeType/scopeId
+ *
+ * scopeType 说明：
+ *   STATION  - 全站（scopeId=安检站deptId，可选）
+ *   BRIGADE  - 大队（scopeId=大队deptId）
+ *   MANAGER  - 主管（scopeId=主管deptId）
+ *   USER     - 个人（scopeId=userId）
+ *   不传     - 按登录用户角色自动判断（与 app 端 /wrong-analysis 相同逻辑）
+ *
+ * pc-radar scopeType 对应 series 规则：
+ *   STATION → 各大队各一条 series
+ *   BRIGADE → 该大队下各主管各一条 series
+ *   MANAGER → 单条主管 series
+ *   USER    → 单条用户 series
+ *   不传    → 站长：各大队 series；其他角色：show=false
+ */
+@RestController
+@RequestMapping("/v1/cs/app/daily-exam/wrong-analysis")
+public class DailyExamWrongAnalysisPcController {
+
+    private static final Logger log = LoggerFactory.getLogger(DailyExamWrongAnalysisPcController.class);
+
+    @Autowired
+    private DailyTaskMapper dailyTaskMapper;
+
+    @Autowired
+    private DailyTaskDetailMapper dailyTaskDetailMapper;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    @Autowired
+    private QuesCatService quesCatService;
+
+    @Autowired
+    private IBaseCheckCategoryService baseCheckCategoryService;
+
+    // =====================================================================
+    // 接口1：总体问题分布（饼图）PC端
+    // =====================================================================
+
+    /**
+     * 总体问题分布（按大类统计错题数）
+     *
+     * @param scopeType 统计范围：STATION/BRIGADE/MANAGER/USER，不传则按角色自动判断
+     * @param scopeId   范围ID
+     */
+    @GetMapping("/pc-overview")
+    public HttpResult<Map<String, Object>> getPcOverview(
+            @RequestParam(required = false, defaultValue = "MONTH") String dateRangeQueryType,
+            @RequestParam(required = false) Integer year,
+            @RequestParam(required = false) Integer quarter,
+            @RequestParam(required = false) Integer month,
+            @RequestParam(required = false) String scopeType,
+            @RequestParam(required = false) Long scopeId) {
+
+        try {
+            LocalDate[] range = resolveDateRange(dateRangeQueryType, year, quarter, month);
+            List<DailyTaskDetail> errorDetails = getErrorDetailsByScope(scopeType, scopeId, range[0], range[1]);
+
+            Map<String, BaseCheckCategory> qcIdToLevel1 = buildQcIdToLevel1Map(errorDetails);
+
+            Map<Long, long[]> countByCategory = new LinkedHashMap<>();
+            Map<Long, String> categoryNames = new LinkedHashMap<>();
+
+            for (DailyTaskDetail detail : errorDetails) {
+                BaseCheckCategory cat = qcIdToLevel1.get(detail.getDtdModuleId());
+                if (cat != null) {
+                    countByCategory.merge(cat.getId(),
+                            new long[]{1, cat.getOrderNum() != null ? cat.getOrderNum() : 99},
+                            (a, b) -> new long[]{a[0] + 1, a[1]});
+                    categoryNames.put(cat.getId(), cat.getName());
+                }
+            }
+
+            List<Map<String, Object>> categories = countByCategory.entrySet().stream()
+                    .sorted(Comparator.comparingLong(e -> e.getValue()[1]))
+                    .map(e -> {
+                        Map<String, Object> item = new LinkedHashMap<>();
+                        item.put("id", e.getKey());
+                        item.put("name", categoryNames.get(e.getKey()));
+                        item.put("count", e.getValue()[0]);
+                        return item;
+                    })
+                    .collect(Collectors.toList());
+
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("categories", categories);
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取总体问题分布失败(PC)", e);
+            return HttpResult.error("获取总体问题分布失败：" + e.getMessage());
+        }
+    }
+
+    // =====================================================================
+    // 接口2：问题分布对比（雷达图）PC端
+    // =====================================================================
+
+    /**
+     * 问题分布对比雷达图
+     *
+     * @param scopeType 统计范围：STATION/BRIGADE/MANAGER/USER，不传则按角色自动判断
+     * @param scopeId   范围ID
+     */
+    @GetMapping("/pc-radar")
+    public HttpResult<Map<String, Object>> getPcRadar(
+            @RequestParam(required = false, defaultValue = "MONTH") String dateRangeQueryType,
+            @RequestParam(required = false) Integer year,
+            @RequestParam(required = false) Integer quarter,
+            @RequestParam(required = false) Integer month,
+            @RequestParam(required = false) String scopeType,
+            @RequestParam(required = false) Long scopeId) {
+
+        try {
+            LocalDate[] range = resolveDateRange(dateRangeQueryType, year, quarter, month);
+
+            // 查询所有大类作为雷达维度
+            BaseCheckCategory level1Query = new BaseCheckCategory();
+            level1Query.setLevel(1);
+            List<BaseCheckCategory> level1Categories = baseCheckCategoryService.selectBaseCheckCategoryList(level1Query);
+            level1Categories.sort(Comparator.comparingInt(c -> c.getOrderNum() != null ? c.getOrderNum() : 99));
+
+            List<String> indicators = level1Categories.stream()
+                    .map(BaseCheckCategory::getName).collect(Collectors.toList());
+            List<Long> indicatorIds = level1Categories.stream()
+                    .map(BaseCheckCategory::getId).collect(Collectors.toList());
+
+            List<Map<String, Object>> series;
+
+            if ("BRIGADE".equals(scopeType) && scopeId != null) {
+                // 大队下各主管各一条 series
+                series = buildRadarSeriesByManagersInBrigade(scopeId, range, indicatorIds);
+
+            } else if ("MANAGER".equals(scopeType) && scopeId != null) {
+                // 单条主管 series
+                series = buildRadarSeriesForSingleManager(scopeId, range, indicatorIds);
+
+            } else if ("USER".equals(scopeType) && scopeId != null) {
+                // 单条用户 series
+                series = buildRadarSeriesForSingleUser(scopeId, range, indicatorIds);
+
+            } else {
+                // STATION 或 role-based：各大队各一条 series
+                Long stationDeptId = getStationDeptId(scopeType, scopeId);
+                if (stationDeptId == null) {
+                    Map<String, Object> noShow = new HashMap<>();
+                    noShow.put("show", false);
+                    return HttpResult.success(noShow);
+                }
+                series = buildRadarSeriesByBrigadesInStation(stationDeptId, range, indicatorIds);
+            }
+
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("show", true);
+            result.put("indicators", indicators);
+            result.put("series", series);
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取问题分布对比失败(PC)", e);
+            return HttpResult.error("获取问题分布对比失败：" + e.getMessage());
+        }
+    }
+
+    // =====================================================================
+    // 私有工具方法
+    // =====================================================================
+
+    /**
+     * 根据 scopeType/scopeId 获取错误明细
+     */
+    private List<DailyTaskDetail> getErrorDetailsByScope(String scopeType, Long scopeId,
+                                                          LocalDate start, LocalDate end) {
+        if ("MANAGER".equals(scopeType) && scopeId != null) {
+            return getErrorDetailsByDepartmentId(scopeId, start, end);
+        } else if ("USER".equals(scopeType) && scopeId != null) {
+            return getErrorDetailsByUserId(scopeId, start, end);
+        } else if ("BRIGADE".equals(scopeType) && scopeId != null) {
+            return getErrorDetailsBySubDepts(scopeId, start, end);
+        } else {
+            // STATION 或 role-based
+            Long deptId = getStationDeptId(scopeType, scopeId);
+            if (deptId == null) {
+                // 非站长，按角色判断
+                RoleInfo role = getRoleInfo();
+                if (role.isBrigade) {
+                    return getErrorDetailsBySubDepts(role.userDeptId, start, end);
+                } else if (role.isKezhang) {
+                    return getErrorDetailsByDepartmentId(role.userDeptId, start, end);
+                } else {
+                    return getErrorDetailsByDeptId(role.userDeptId, start, end);
+                }
+            }
+            List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(deptId);
+            Set<Long> allDeptIds = new HashSet<>();
+            allDeptIds.add(deptId);
+            if (subDepts != null) subDepts.forEach(d -> allDeptIds.add(d.getDeptId()));
+            return getErrorDetailsByDeptIds(allDeptIds, start, end);
+        }
+    }
+
+    /**
+     * 获取站级 deptId：
+     * - scopeType=STATION → 取 scopeId（若有）或当前用户 deptId（需是站长角色）
+     * - scopeType=null → 若当前用户是站长则取其 deptId，否则返回 null
+     */
+    private Long getStationDeptId(String scopeType, Long scopeId) {
+        if ("STATION".equals(scopeType)) {
+            if (scopeId != null) return scopeId;
+            return SecurityUtils.getLoginUser().getDeptId();
+        }
+        RoleInfo role = getRoleInfo();
+        if (role.isStation) return role.userDeptId;
+        return null;
+    }
+
+    /**
+     * 雷达图：站下各大队各一条 series
+     */
+    private List<Map<String, Object>> buildRadarSeriesByBrigadesInStation(
+            Long stationDeptId, LocalDate[] range, List<Long> indicatorIds) {
+
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(stationDeptId);
+        List<SysDept> brigadeDepts = subDepts == null ? Collections.emptyList() :
+                subDepts.stream()
+                        .filter(d -> stationDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                        .collect(Collectors.toList());
+
+        List<Map<String, Object>> series = new ArrayList<>();
+        for (SysDept brigade : brigadeDepts) {
+            List<DailyTaskDetail> details = getErrorDetailsBySubDepts(brigade.getDeptId(), range[0], range[1]);
+            series.add(buildRadarSeriesItem(brigade.getDeptName(), brigade.getDeptId(), details, indicatorIds));
+        }
+        return series;
+    }
+
+    /**
+     * 雷达图：大队下各主管各一条 series
+     */
+    private List<Map<String, Object>> buildRadarSeriesByManagersInBrigade(
+            Long brigadeId, LocalDate[] range, List<Long> indicatorIds) {
+
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(brigadeId);
+        List<SysDept> managerDepts = subDepts == null ? Collections.emptyList() :
+                subDepts.stream()
+                        .filter(d -> brigadeId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                        .collect(Collectors.toList());
+
+        List<Map<String, Object>> series = new ArrayList<>();
+        for (SysDept manager : managerDepts) {
+            List<DailyTaskDetail> details = getErrorDetailsByDepartmentId(manager.getDeptId(), range[0], range[1]);
+            series.add(buildRadarSeriesItem(manager.getDeptName(), manager.getDeptId(), details, indicatorIds));
+        }
+        return series;
+    }
+
+    /**
+     * 雷达图：单条主管 series
+     */
+    private List<Map<String, Object>> buildRadarSeriesForSingleManager(
+            Long managerId, LocalDate[] range, List<Long> indicatorIds) {
+
+        List<DailyTaskDetail> details = getErrorDetailsByDepartmentId(managerId, range[0], range[1]);
+        String name = getManagerName(managerId);
+        return Collections.singletonList(buildRadarSeriesItem(name, managerId, details, indicatorIds));
+    }
+
+    /**
+     * 雷达图：单条用户 series
+     */
+    private List<Map<String, Object>> buildRadarSeriesForSingleUser(
+            Long userId, LocalDate[] range, List<Long> indicatorIds) {
+
+        List<DailyTaskDetail> details = getErrorDetailsByUserId(userId, range[0], range[1]);
+        String name = getUserName(userId, details);
+        Map<String, Object> item = buildRadarSeriesItemWithUserId(name, userId, details, indicatorIds);
+        return Collections.singletonList(item);
+    }
+
+    /**
+     * 构建雷达图单条 series（deptId）
+     */
+    private Map<String, Object> buildRadarSeriesItem(String name, Long deptId,
+                                                      List<DailyTaskDetail> details,
+                                                      List<Long> indicatorIds) {
+        Map<String, BaseCheckCategory> qcIdToLevel1 = buildQcIdToLevel1Map(details);
+        Map<Long, Long> countMap = details.stream()
+                .filter(d -> qcIdToLevel1.get(d.getDtdModuleId()) != null)
+                .collect(Collectors.groupingBy(
+                        d -> qcIdToLevel1.get(d.getDtdModuleId()).getId(),
+                        Collectors.counting()));
+
+        List<Long> data = indicatorIds.stream()
+                .map(id -> countMap.getOrDefault(id, 0L))
+                .collect(Collectors.toList());
+
+        Map<String, Object> s = new LinkedHashMap<>();
+        s.put("name", name);
+        s.put("deptId", deptId);
+        s.put("data", data);
+        return s;
+    }
+
+    /**
+     * 构建雷达图单条 series（userId）
+     */
+    private Map<String, Object> buildRadarSeriesItemWithUserId(String name, Long userId,
+                                                                List<DailyTaskDetail> details,
+                                                                List<Long> indicatorIds) {
+        Map<String, BaseCheckCategory> qcIdToLevel1 = buildQcIdToLevel1Map(details);
+        Map<Long, Long> countMap = details.stream()
+                .filter(d -> qcIdToLevel1.get(d.getDtdModuleId()) != null)
+                .collect(Collectors.groupingBy(
+                        d -> qcIdToLevel1.get(d.getDtdModuleId()).getId(),
+                        Collectors.counting()));
+
+        List<Long> data = indicatorIds.stream()
+                .map(id -> countMap.getOrDefault(id, 0L))
+                .collect(Collectors.toList());
+
+        Map<String, Object> s = new LinkedHashMap<>();
+        s.put("name", name);
+        s.put("userId", userId);
+        s.put("data", data);
+        return s;
+    }
+
+    private RoleInfo getRoleInfo() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        List<String> roleKeys = loginUser.getUser().getRoles().stream()
+                .map(SysRole::getRoleKey).collect(Collectors.toList());
+        Long userDeptId = loginUser.getDeptId();
+        Long userId = loginUser.getUserId();
+
+        boolean isStation = userId == 1L
+                || roleKeys.contains(RoleTypeEnum.admin.getCode())
+                || roleKeys.contains(RoleTypeEnum.test.getCode())
+                || roleKeys.contains(RoleTypeEnum.zhijianke.getCode());
+        boolean isBrigade = !isStation && (roleKeys.contains(RoleTypeEnum.jingli.getCode())
+                || roleKeys.contains(RoleTypeEnum.xingzheng.getCode()));
+        boolean isKezhang = !isStation && !isBrigade && roleKeys.contains(RoleTypeEnum.kezhang.getCode());
+
+        RoleInfo info = new RoleInfo();
+        info.isStation = isStation;
+        info.isBrigade = isBrigade;
+        info.isKezhang = isKezhang;
+        info.userDeptId = userDeptId;
+        return info;
+    }
+
+    private static class RoleInfo {
+        boolean isStation;
+        boolean isBrigade;
+        boolean isKezhang;
+        Long userDeptId;
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsByDeptIds(Set<Long> deptIds, LocalDate start, LocalDate end) {
+        if (deptIds == null || deptIds.isEmpty()) return Collections.emptyList();
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.in(DailyTask::getDtDeptId, deptIds);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsByDepartmentId(Long departmentId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.eq(DailyTask::getDtDepartmentId, departmentId);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsByDeptId(Long deptId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.eq(DailyTask::getDtDeptId, deptId);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsByUserId(Long userId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.eq(DailyTask::getDtUserId, userId);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    /**
+     * 查询上级部门（大队）下所有直接子部门（主管）的错误明细
+     */
+    private List<DailyTaskDetail> getErrorDetailsBySubDepts(Long parentDeptId, LocalDate start, LocalDate end) {
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(parentDeptId);
+        if (subDepts == null || subDepts.isEmpty()) return Collections.emptyList();
+        Set<Long> managerIds = subDepts.stream()
+                .filter(d -> parentDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                .map(SysDept::getDeptId)
+                .collect(Collectors.toSet());
+        if (managerIds.isEmpty()) return Collections.emptyList();
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.in(DailyTask::getDtDepartmentId, managerIds);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsFromTasks(List<DailyTask> tasks) {
+        if (tasks == null || tasks.isEmpty()) return Collections.emptyList();
+        Set<String> taskIds = tasks.stream().map(DailyTask::getDtId).collect(Collectors.toSet());
+        LambdaQueryWrapper<DailyTaskDetail> detailWrapper = new LambdaQueryWrapper<>();
+        detailWrapper.in(DailyTaskDetail::getDtdTaskId, taskIds);
+        detailWrapper.eq(DailyTaskDetail::getDtdIsCorrect, false);
+        detailWrapper.eq(DailyTaskDetail::getDelStatus, 0);
+        return dailyTaskDetailMapper.selectList(detailWrapper);
+    }
+
+    private Map<String, BaseCheckCategory> buildQcIdToLevel1Map(List<DailyTaskDetail> details) {
+        Map<String, BaseCheckCategory> result = new HashMap<>();
+        Map<String, BaseCheckCategory> qcNameToLevel1Cache = new HashMap<>();
+
+        for (DailyTaskDetail detail : details) {
+            String qcId = detail.getDtdModuleId();
+            if (qcId == null || qcId.trim().isEmpty() || result.containsKey(qcId)) continue;
+
+            LambdaQueryWrapper<QuesCat> catWrapper = new LambdaQueryWrapper<>();
+            catWrapper.eq(QuesCat::getQcId, qcId);
+            catWrapper.eq(QuesCat::getDelStatus, 0);
+            QuesCat quesCat = quesCatService.getOne(catWrapper);
+
+            if (quesCat == null) {
+                result.put(qcId, null);
+                continue;
+            }
+
+            String qcName = quesCat.getQcName();
+            if (qcNameToLevel1Cache.containsKey(qcName)) {
+                result.put(qcId, qcNameToLevel1Cache.get(qcName));
+            } else {
+                BaseCheckCategory level1 = baseCheckCategoryService.selectLevel1ByLevel2Name(qcName);
+                qcNameToLevel1Cache.put(qcName, level1);
+                result.put(qcId, level1);
+            }
+        }
+        return result;
+    }
+
+    private LocalDate[] resolveDateRange(String dateRangeQueryType, Integer year, Integer quarter, Integer month) {
+        LocalDate today = LocalDate.now();
+        int y = (year != null) ? year : today.getYear();
+        String type = (dateRangeQueryType != null) ? dateRangeQueryType : "MONTH";
+        LocalDate start, end;
+        switch (type) {
+            case "YEAR":
+                start = LocalDate.of(y, 1, 1);
+                end = LocalDate.of(y, 12, 31);
+                break;
+            case "QUARTER":
+                int q = (quarter != null) ? quarter : 1;
+                start = LocalDate.of(y, (q - 1) * 3 + 1, 1);
+                end = start.plusMonths(3).minusDays(1);
+                break;
+            case "MONTH":
+            default:
+                int m = (month != null) ? month : today.getMonthValue();
+                start = LocalDate.of(y, m, 1);
+                end = start.withDayOfMonth(start.lengthOfMonth());
+                break;
+        }
+        return new LocalDate[]{start, end};
+    }
+
+    private String getManagerName(Long managerId) {
+        try {
+            SysDept dept = sysDeptMapper.selectDeptById(managerId);
+            if (dept != null) return dept.getDeptName();
+        } catch (Exception ignored) {
+        }
+        return "主管" + managerId;
+    }
+
+    private String getUserName(Long userId, List<DailyTaskDetail> details) {
+        if (details.isEmpty()) return "用户" + userId;
+        Set<String> taskIds = details.stream().map(DailyTaskDetail::getDtdTaskId).collect(Collectors.toSet());
+        LambdaQueryWrapper<DailyTask> w = new LambdaQueryWrapper<>();
+        w.in(DailyTask::getDtId, taskIds);
+        w.eq(DailyTask::getDelStatus, 0);
+        w.last("LIMIT 1");
+        DailyTask task = dailyTaskMapper.selectOne(w);
+        if (task != null && task.getDtUserName() != null) return task.getDtUserName();
+        return "用户" + userId;
+    }
+}