抽问抽答完成趋势回滚原接口，新增completion-comparison多期对比接口

/daily-exam/completion-trend 恢复为趋势折线接口（按角色分级展示）
新增 /daily-exam/completion-comparison 实现多期聚合对比（适配美兰4级架构）：
  YEAR返回[去年,今年]，QUARTER返回[去年同季度,上季度,本季度]，
  MONTH返回[去年同月,上月,本月]，携带同比(yoyRate)和环比(chainRatio)。
  scopeType: STATION按大队分组+全站汇总，BRIGADE按主管分组，MANAGER/USER单条series。

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

@@ -0,0 +1,404 @@
+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.domain.DailyTask;
+import com.sundot.airport.exam.mapper.DailyTaskMapper;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+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.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.Date;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 抽问抽答完成趋势对比接口（美兰4级架构）
+ * STATION > 大队(BRIGADE) > 主管(MANAGER) > 班组
+ * 始终返回多期聚合对比数据：
+ *   YEAR：[去年, 今年] 含同比(yoyRate)
+ *   QUARTER：[去年同季度, 上季度, 本季度] 含同比+环比(chainRatio)
+ *   MONTH：[去年同月, 上月, 本月] 含同比+环比
+ */
+@RestController
+@RequestMapping("/v1/cs/app/daily-exam")
+public class DailyExamComparisonController {
+
+    private static final Logger log = LoggerFactory.getLogger(DailyExamComparisonController.class);
+
+    @Autowired
+    private DailyTaskMapper dailyTaskMapper;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    /**
+     * 抽问抽答完成趋势对比
+     *
+     * @param dateRangeQueryType 时间类型：YEAR/QUARTER/MONTH，默认 MONTH
+     * @param year               年份，默认当前年
+     * @param quarter            季度 1-4，dateRangeQueryType=QUARTER 时有效
+     * @param month              月份 1-12，dateRangeQueryType=MONTH 时有效
+     * @param scopeType          统计范围：STATION/BRIGADE/MANAGER/USER，不传则按登录角色自动判断
+     * @param scopeId            统计范围ID（deptId 或 userId）
+     */
+    @GetMapping("/completion-comparison")
+    public HttpResult<Map<String, Object>> getCompletionComparison(
+            @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 {
+            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 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);
+                return HttpResult.success(noShow);
+            }
+
+            int curYear = (year != null) ? year : LocalDate.now().getYear();
+            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);
+
+            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));
+
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取抽问抽答完成趋势对比失败", e);
+            return HttpResult.error("获取完成趋势对比失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 构建各期日期范围列表
+     * YEAR：[去年, 今年]
+     * QUARTER：[去年同季度, 上季度, 本季度]
+     * MONTH：[去年同月, 上月, 本月]
+     */
+    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;
+        }
+        return periods;
+    }
+
+    /**
+     * 构建 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
+     */
+    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);
+
+        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));
+
+        } 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));
+
+        } else if ("BRIGADE".equals(scopeType) && scopeId != null) {
+            return buildBrigadeSeries(scopeId, periods, isYearType);
+
+        } else {
+            Long stationDeptId = ("STATION".equals(scopeType) && scopeId != null) ? scopeId : userDeptId;
+            if (isStation || "STATION".equals(scopeType)) {
+                return buildStationSeries(stationDeptId, periods, isYearType);
+            } else if (isBrigade) {
+                return buildBrigadeSeries(userDeptId, periods, isYearType);
+            } 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));
+            }
+        }
+    }
+
+    /**
+     * 站长视角：按大队分组，各期聚合 + 全站汇总
+     */
+    private List<Map<String, Object>> buildStationSeries(Long stationDeptId, List<LocalDate[]> periods, boolean isYearType) {
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(stationDeptId);
+        if (subDepts == null) subDepts = Collections.emptyList();
+
+        // 大队（站的直接下级）
+        List<SysDept> brigadeDepts = subDepts.stream()
+                .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);
+
+        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));
+        }
+        series.add(buildSeriesItem("全站", null, null, totalData, isYearType));
+        return series;
+    }
+
+    /**
+     * 大队视角：按主管分组，各期聚合
+     */
+    private List<Map<String, Object>> buildBrigadeSeries(Long brigadeId, List<LocalDate[]> periods, boolean isYearType) {
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(brigadeId);
+        if (subDepts == null) subDepts = Collections.emptyList();
+
+        List<SysDept> managerDepts = 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<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));
+        }
+        return series;
+    }
+
+    /**
+     * 构建单条 series map，含同比/环比
+     * data[0]=去年同期，data[1]=上期(仅QUARTER/MONTH)，data[last]=本期
+     */
+    private Map<String, Object> buildSeriesItem(String name, Long deptId, Long userId,
+                                                 List<Integer> data, boolean isYearType) {
+        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)));
+        } else {
+            s.put("chainRatio", null);
+        }
+        return s;
+    }
+
+    /**
+     * 计算变化率百分比，base=0 时返回 null
+     */
+    private BigDecimal calcRate(int current, int base) {
+        if (base == 0) return null;
+        return BigDecimal.valueOf(current - base)
+                .multiply(BigDecimal.valueOf(100))
+                .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 计算起止日期
+     */
+    private LocalDate[] resolveDateRange(String type, Integer year, Integer quarter, Integer month) {
+        LocalDate today = LocalDate.now();
+        int y = (year != null) ? year : today.getYear();
+        LocalDate start, end;
+        switch (type == null ? "MONTH" : 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 List<DailyTask> queryTasksByDeptIds(Set<Long> deptIds, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(DailyTask::getDtDeptId, deptIds);
+        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        wrapper.eq(DailyTask::getDelStatus, 0);
+        return dailyTaskMapper.selectList(wrapper);
+    }
+
+    private List<DailyTask> queryTasksByDepartmentId(Long departmentId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DailyTask::getDtDepartmentId, departmentId);
+        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        wrapper.eq(DailyTask::getDelStatus, 0);
+        return dailyTaskMapper.selectList(wrapper);
+    }
+
+    private List<DailyTask> queryTasksByUserId(Long userId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DailyTask::getDtUserId, userId);
+        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        wrapper.eq(DailyTask::getDelStatus, 0);
+        return dailyTaskMapper.selectList(wrapper);
+    }
+}

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

@@ -5,6 +5,8 @@ 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.core.domain.SysAnalysisReportParamDto;
+import com.sundot.airport.common.utils.DateRangeQueryUtils;
 import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.exam.adapter.DailyTaskToExamAdapter;
 import com.sundot.airport.exam.common.ClientTypeConstant;
@@ -32,11 +34,10 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-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;
 
@@ -291,27 +292,16 @@ public class DailyExamController {
 
     /**
      * 抽问抽答完成趋势
-     * 美兰4级架构：STATION > 大队(BRIGADE) > 主管(MANAGER) > 班组
-     * 始终返回多期对比数据：
-     *   YEAR：[去年, 今年] 含同比
-     *   QUARTER：[去年同季度, 上季度, 本季度] 含同比+环比
-     *   MONTH：[去年同月, 上月, 本月] 含同比+环比
+     * 美兰4级架构：STATION > 大队(BRIGADE) > 主管(MANAGER) > 班组(TEAMS)
+     * 站长/管理员/质检科：各大队完成趋势折线
+     * 大队长（经理/行政）：本大队各主管完成趋势折线
+     * 主管：本主管室完成趋势（单条折线）
+     * 班组长/安检员：show=false
      *
-     * @param dateRangeQueryType 时间类型：YEAR/QUARTER/MONTH，默认 MONTH
-     * @param year               年份，默认当前年
-     * @param quarter            季度 1-4，dateRangeQueryType=QUARTER 时有效
-     * @param month              月份 1-12，dateRangeQueryType=MONTH 时有效
-     * @param scopeType          统计范围：STATION/BRIGADE/MANAGER/USER，不传则按登录角色自动判断
-     * @param scopeId            统计范围ID（deptId 或 userId）
+     * @param param dateRangeQueryType=YEAR|QUARTER|MONTH，year，quarter，month
      */
     @GetMapping("/completion-trend")
-    public HttpResult<Map<String, Object>> getCompletionTrend(
-            @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) {
+    public HttpResult<Map<String, Object>> getCompletionTrend(SysAnalysisReportParamDto param) {
 
         try {
             LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -326,29 +316,100 @@ public class DailyExamController {
                     || roleKeys.contains(RoleTypeEnum.zhijianke.getCode());
             boolean isBrigade = !isStation && (roleKeys.contains(RoleTypeEnum.jingli.getCode())
                     || roleKeys.contains(RoleTypeEnum.xingzheng.getCode()));
-            boolean isManager = !isStation && !isBrigade && roleKeys.contains(RoleTypeEnum.kezhang.getCode());
+            boolean isKezhang = !isStation && !isBrigade && roleKeys.contains(RoleTypeEnum.kezhang.getCode());
 
-            // 班组长及以下不显示（未传 scopeType 且无管理权限）
-            if (scopeType == null && !isStation && !isBrigade && !isManager) {
+            // 班组长及以下不显示此tab
+            if (!isStation && !isBrigade && !isKezhang) {
                 Map<String, Object> noShow = new HashMap<>();
                 noShow.put("show", false);
                 return HttpResult.success(noShow);
             }
 
-            int curYear = (year != null) ? year : LocalDate.now().getYear();
-            int curQuarter = (quarter != null) ? quarter : ((LocalDate.now().getMonthValue() - 1) / 3 + 1);
-            int curMonth = (month != null) ? month : LocalDate.now().getMonthValue();
+            LocalDate[] range = resolveDateRange(param);
+            LocalDate start = range[0];
+            LocalDate end = range[1];
+            boolean byMonth = "YEAR".equals(param != null ? param.getDateRangeQueryType() : null);
+            List<String> xAxis = buildXAxis(start, end, byMonth);
+            List<Map<String, Object>> series = new ArrayList<>();
+
+            if (isStation) {
+                // 站长：查该站所有子部门，按大队分组
+                List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(userDeptId);
+                if (subDepts == null) subDepts = Collections.emptyList();
+
+                // 大队（站的直接下级）
+                List<SysDept> brigadeDepts = subDepts.stream()
+                        .filter(d -> userDeptId.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 && !userDeptId.equals(d.getParentId())) {
+                        // 非直接下级，其parentId为某个大队，记录映射（主管级别）
+                        managerToBrigadeId.put(d.getDeptId(), d.getParentId());
+                    }
+                }
+
+                // 查全站所有任务
+                Set<Long> allDeptIds = new HashSet<>();
+                allDeptIds.add(userDeptId);
+                subDepts.forEach(d -> allDeptIds.add(d.getDeptId()));
+                List<DailyTask> allTasks = queryTasksByDeptIds(allDeptIds, start, end);
+
+                // 按大队分组生成折线
+                for (SysDept brigade : brigadeDepts) {
+                    Long brigadeId = brigade.getDeptId();
+                    List<DailyTask> brigadeTasks = allTasks.stream()
+                            .filter(t -> {
+                                Long managerId = t.getDtDepartmentId();
+                                if (managerId == null) return false;
+                                Long parentBrigadeId = managerToBrigadeId.get(managerId);
+                                return brigadeId.equals(parentBrigadeId);
+                            })
+                            .collect(Collectors.toList());
+                    Map<String, Object> item = new LinkedHashMap<>();
+                    item.put("name", brigade.getDeptName());
+                    item.put("deptId", brigadeId);
+                    item.put("data", buildSeriesData(xAxis, brigadeTasks, byMonth));
+                    series.add(item);
+                }
+
+            } else if (isBrigade) {
+                // 大队长：查本大队下各主管的任务
+                List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(userDeptId);
+                if (subDepts == null) subDepts = Collections.emptyList();
+
+                // 主管（大队的直接下级）
+                List<SysDept> managerDepts = subDepts.stream()
+                        .filter(d -> userDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                        .collect(Collectors.toList());
+
+                for (SysDept manager : managerDepts) {
+                    List<DailyTask> tasks = queryTasksByDepartmentId(manager.getDeptId(), start, end);
+                    Map<String, Object> item = new LinkedHashMap<>();
+                    item.put("name", manager.getDeptName());
+                    item.put("deptId", manager.getDeptId());
+                    item.put("data", buildSeriesData(xAxis, tasks, byMonth));
+                    series.add(item);
+                }
 
-            List<LocalDate[]> periods = buildPeriods(dateRangeQueryType, curYear, curQuarter, curMonth);
-            List<String> xAxis = buildXAxisLabels(dateRangeQueryType, curYear, curQuarter, curMonth);
+            } else {
+                // 主管：本主管室所有任务，一条折线
+                List<DailyTask> tasks = queryTasksByDepartmentId(userDeptId, start, end);
+                String deptName = loginUser.getUser().getDept() != null
+                        ? loginUser.getUser().getDept().getDeptName() : "本主管";
+                Map<String, Object> item = new LinkedHashMap<>();
+                item.put("name", deptName);
+                item.put("deptId", userDeptId);
+                item.put("data", buildSeriesData(xAxis, tasks, byMonth));
+                series.add(item);
+            }
 
             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) {
@@ -358,273 +419,75 @@ public class DailyExamController {
     }
 
     /**
-     * 构建各期日期范围列表
-     * YEAR：[去年, 今年]
-     * QUARTER：[去年同季度, 上季度, 本季度]
-     * MONTH：[去年同月, 上月, 本月]
-     */
-    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;
-        }
-        return periods;
-    }
-
-    /**
-     * 构建 X 轴中文标签列表
+     * 根据 SysAnalysisReportParamDto 计算起止日期
+     * YEAR → 全年；QUARTER → 指定季度；MONTH → 指定月份；默认 → 当月
      */
-    private List<String> buildXAxisLabels(String type, int year, int quarter, int month) {
-        List<String> labels = new ArrayList<>();
-        switch (type == null ? "MONTH" : type) {
+    private LocalDate[] resolveDateRange(SysAnalysisReportParamDto param) {
+        LocalDate today = LocalDate.now();
+        int year = (param != null && param.getYear() != null) ? param.getYear() : today.getYear();
+        String type = (param != null && param.getDateRangeQueryType() != null) ? param.getDateRangeQueryType() : "MONTH";
+        com.sundot.airport.common.core.domain.SysAnalysisReportDateRangeDto range;
+        switch (type) {
             case "YEAR":
-                labels.add((year - 1) + "年");
-                labels.add(year + "年");
+                range = DateRangeQueryUtils.getYearRange(year, null);
                 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 + "季度");
+                int quarter = (param.getQuarter() != null) ? param.getQuarter() : 1;
+                range = DateRangeQueryUtils.getQuarterRange(year, quarter, null);
                 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 + "月");
+            default: // MONTH
+                int month = (param != null && param.getMonth() != null) ? param.getMonth() : today.getMonthValue();
+                range = DateRangeQueryUtils.getMonthRange(year, month, null);
                 break;
         }
-        return labels;
+        return new LocalDate[]{
+                ((java.sql.Date) range.getStartDate()).toLocalDate(),
+                ((java.sql.Date) range.getEndDate()).toLocalDate()
+        };
     }
 
     /**
-     * 构建多期对比 series 列表（适配美兰4级架构）
-     * STATION：各大队各一条 series + 全站汇总
-     * BRIGADE：该大队各主管各一条 series
-     * MANAGER/USER：单条 series
+     * 生成X轴标签列表
+     * byMonth=true：每月一个标签（格式 yyyy-MM）；false：每天一个标签（格式 yyyy-MM-dd）
      */
-    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);
-
-        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));
-
-        } 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));
+    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);
             }
-            return Collections.singletonList(buildSeriesItem(name, null, scopeId, data, isYearType));
-
-        } else if ("BRIGADE".equals(scopeType) && scopeId != null) {
-            return buildBrigadeSeries(scopeId, periods, isYearType);
-
         } else {
-            Long stationDeptId = ("STATION".equals(scopeType) && scopeId != null) ? scopeId : userDeptId;
-            if (isStation || "STATION".equals(scopeType)) {
-                return buildStationSeries(stationDeptId, periods, isYearType);
-            } else if (isBrigade) {
-                return buildBrigadeSeries(userDeptId, periods, isYearType);
-            } else {
-                // isManager：单条 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));
+            LocalDate cursor = start;
+            while (!cursor.isAfter(end)) {
+                xAxis.add(cursor.toString());
+                cursor = cursor.plusDays(1);
             }
         }
+        return xAxis;
     }
 
     /**
-     * 站长视角：按大队分组，各期聚合 + 全站汇总
+     * 构建某条折线的数据数组，与 xAxis 对齐
      */
-    private List<Map<String, Object>> buildStationSeries(Long stationDeptId, List<LocalDate[]> periods, boolean isYearType) {
-        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(stationDeptId);
-        if (subDepts == null) subDepts = Collections.emptyList();
-
-        List<SysDept> brigadeDepts = subDepts.stream()
-                .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]));
+    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> data = new ArrayList<>();
+        for (String label : xAxis) {
+            data.add(countMap.getOrDefault(label, 0L).intValue());
         }
-
-        List<Map<String, Object>> series = new ArrayList<>();
-        List<Integer> totalData = new ArrayList<>();
-        for (int i = 0; i < periods.size(); i++) totalData.add(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));
-        }
-        series.add(buildSeriesItem("全站", null, null, totalData, isYearType));
-        return series;
+        return data;
     }
 
     /**
-     * 大队视角：按主管分组，各期聚合
-     */
-    private List<Map<String, Object>> buildBrigadeSeries(Long brigadeId, List<LocalDate[]> periods, boolean isYearType) {
-        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(brigadeId);
-        if (subDepts == null) subDepts = Collections.emptyList();
-
-        List<SysDept> managerDepts = 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<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));
-        }
-        return series;
-    }
-
-    /**
-     * 构建单条 series map，含同比/环比
-     * data[0]=去年同期，data[1]=上期(仅QUARTER/MONTH)，data[last]=本期
-     */
-    private Map<String, Object> buildSeriesItem(String name, Long deptId, Long userId,
-                                                 List<Integer> data, boolean isYearType) {
-        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)));
-        } else {
-            s.put("chainRatio", null);
-        }
-        return s;
-    }
-
-    /**
-     * 计算变化率百分比，base=0 时返回 null
-     */
-    private BigDecimal calcRate(int current, int base) {
-        if (base == 0) return null;
-        return BigDecimal.valueOf(current - base)
-                .multiply(BigDecimal.valueOf(100))
-                .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();
-    }
-
-    /**
-     * 根据 dateRangeQueryType/year/quarter/month 计算起止日期
-     */
-    private LocalDate[] resolveDateRange(String type, Integer year, Integer quarter, Integer month) {
-        LocalDate today = LocalDate.now();
-        int y = (year != null) ? year : today.getYear();
-        LocalDate start, end;
-        switch (type == null ? "MONTH" : 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};
-    }
-
-    /**
-     * 按部门ID集合查询任务
+     * 按部门ID集合查询任务（用于站长视角：通过dtDeptId匹配所有子部门）
      */
     private List<DailyTask> queryTasksByDeptIds(Set<Long> deptIds, LocalDate start, LocalDate end) {
         LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
@@ -636,7 +499,7 @@ public class DailyExamController {
     }
 
     /**
-     * 按主管ID查询任务（dtDepartmentId）
+     * 按主管ID查询任务（通过dtDepartmentId匹配）
      */
     private List<DailyTask> queryTasksByDepartmentId(Long departmentId, LocalDate start, LocalDate end) {
         LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
@@ -646,16 +509,4 @@ public class DailyExamController {
         wrapper.eq(DailyTask::getDelStatus, 0);
         return dailyTaskMapper.selectList(wrapper);
     }
-
-    /**
-     * 按用户ID查询任务（dtUserId）
-     */
-    private List<DailyTask> queryTasksByUserId(Long userId, LocalDate start, LocalDate end) {
-        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DailyTask::getDtUserId, userId);
-        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
-        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
-        wrapper.eq(DailyTask::getDelStatus, 0);
-        return dailyTaskMapper.selectList(wrapper);
-    }
 }