feat: 抽问抽答完成趋势、错题分析接口参数改为 dateRangeQueryType/year/quarter/month 形式

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;
@@ -296,15 +298,10 @@ public class DailyExamController {
      * 主管：本主管室完成趋势（单条折线）
      * 班组长/安检员：show=false
      *
-     * @param timeType  时间类型：year/month/custom，默认 month
-     * @param startDate 自定义开始日期（yyyy-MM-dd），timeType=custom 时有效
-     * @param endDate   自定义结束日期（yyyy-MM-dd），timeType=custom 时有效
+     * @param param dateRangeQueryType=YEAR|QUARTER|MONTH，year，quarter，month
      */
     @GetMapping("/completion-trend")
-    public HttpResult<Map<String, Object>> getCompletionTrend(
-            @RequestParam(required = false, defaultValue = "month") String timeType,
-            @RequestParam(required = false) String startDate,
-            @RequestParam(required = false) String endDate) {
+    public HttpResult<Map<String, Object>> getCompletionTrend(SysAnalysisReportParamDto param) {
 
         try {
             LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -328,10 +325,10 @@ public class DailyExamController {
                 return HttpResult.success(noShow);
             }
 
-            LocalDate[] range = resolveDateRange(timeType, startDate, endDate);
+            LocalDate[] range = resolveDateRange(param);
             LocalDate start = range[0];
             LocalDate end = range[1];
-            boolean byMonth = "year".equals(timeType);
+            boolean byMonth = "YEAR".equals(param != null ? param.getDateRangeQueryType() : null);
             List<String> xAxis = buildXAxis(start, end, byMonth);
             List<Map<String, Object>> series = new ArrayList<>();
 
@@ -422,26 +419,31 @@ public class DailyExamController {
     }
 
     /**
-     * 根据 timeType 计算起止日期
+     * 根据 SysAnalysisReportParamDto 计算起止日期
+     * YEAR → 全年；QUARTER → 指定季度；MONTH → 指定月份；默认 → 当月
      */
-    private LocalDate[] resolveDateRange(String timeType, String startDate, String endDate) {
+    private LocalDate[] resolveDateRange(SysAnalysisReportParamDto param) {
         LocalDate today = LocalDate.now();
-        LocalDate start;
-        LocalDate end = today;
-        switch (timeType == null ? "month" : timeType) {
-            case "year":
-                start = today.withDayOfYear(1);
-                end = today.withMonth(12).withDayOfMonth(31);
+        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":
+                range = DateRangeQueryUtils.getYearRange(year, null);
                 break;
-            case "custom":
-                start = (startDate != null) ? LocalDate.parse(startDate) : today.withDayOfMonth(1);
-                end = (endDate != null) ? LocalDate.parse(endDate) : today;
+            case "QUARTER":
+                int quarter = (param.getQuarter() != null) ? param.getQuarter() : 1;
+                range = DateRangeQueryUtils.getQuarterRange(year, quarter, null);
                 break;
-            default: // month
-                start = today.withDayOfMonth(1);
+            default: // MONTH
+                int month = (param != null && param.getMonth() != null) ? param.getMonth() : today.getMonthValue();
+                range = DateRangeQueryUtils.getMonthRange(year, month, null);
                 break;
         }
-        return new LocalDate[]{start, end};
+        return new LocalDate[]{
+                ((java.sql.Date) range.getStartDate()).toLocalDate(),
+                ((java.sql.Date) range.getEndDate()).toLocalDate()
+        };
     }
 
     /**

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/DailyExamWrongAnalysisController.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.common.HttpResult;
 import com.sundot.airport.exam.common.service.QuesCatService;
@@ -73,19 +75,14 @@ public class DailyExamWrongAnalysisController {
      * 总体问题分布（按大类统计错题数）
      * 站长/管理员/质检科：全站；大队长：本大队；主管：本主管室；班组长：本班组
      *
-     * @param timeType  year/month/custom，默认 month
-     * @param startDate 自定义开始日期 yyyy-MM-dd
-     * @param endDate   自定义结束日期 yyyy-MM-dd
+     * @param param dateRangeQueryType=YEAR|QUARTER|MONTH，year，quarter，month
      */
     @GetMapping("/overview")
-    public HttpResult<Map<String, Object>> getOverview(
-            @RequestParam(required = false, defaultValue = "month") String timeType,
-            @RequestParam(required = false) String startDate,
-            @RequestParam(required = false) String endDate) {
+    public HttpResult<Map<String, Object>> getOverview(SysAnalysisReportParamDto param) {
 
         try {
             RoleInfo role = getRoleInfo();
-            LocalDate[] range = resolveDateRange(timeType, startDate, endDate);
+            LocalDate[] range = resolveDateRange(param);
 
             List<DailyTaskDetail> errorDetails = getErrorDetails(role, range[0], range[1]);
 
@@ -131,15 +128,10 @@ public class DailyExamWrongAnalysisController {
     /**
      * 问题分布对比雷达图（仅站长可见，各大队在各大类的错题数对比）
      *
-     * @param timeType  year/month/custom，默认 month
-     * @param startDate 自定义开始日期
-     * @param endDate   自定义结束日期
+     * @param param dateRangeQueryType=YEAR|QUARTER|MONTH，year，quarter，month
      */
     @GetMapping("/radar")
-    public HttpResult<Map<String, Object>> getRadar(
-            @RequestParam(required = false, defaultValue = "month") String timeType,
-            @RequestParam(required = false) String startDate,
-            @RequestParam(required = false) String endDate) {
+    public HttpResult<Map<String, Object>> getRadar(SysAnalysisReportParamDto param) {
 
         try {
             RoleInfo role = getRoleInfo();
@@ -149,7 +141,7 @@ public class DailyExamWrongAnalysisController {
                 return HttpResult.success(noShow);
             }
 
-            LocalDate[] range = resolveDateRange(timeType, startDate, endDate);
+            LocalDate[] range = resolveDateRange(param);
 
             // 查询所有大类，作为雷达图的维度
             BaseCheckCategory level1Query = new BaseCheckCategory();
@@ -220,16 +212,12 @@ public class DailyExamWrongAnalysisController {
      * 班组长及以下：show=false
      *
      * @param categoryId 大类ID（base_check_category.id，level=1）
-     * @param timeType   year/month/custom，默认 month
-     * @param startDate  自定义开始日期
-     * @param endDate    自定义结束日期
+     * @param param      dateRangeQueryType=YEAR|QUARTER|MONTH，year，quarter，month
      */
     @GetMapping("/category-detail")
     public HttpResult<Map<String, Object>> getCategoryDetail(
             @RequestParam Long categoryId,
-            @RequestParam(required = false, defaultValue = "month") String timeType,
-            @RequestParam(required = false) String startDate,
-            @RequestParam(required = false) String endDate) {
+            SysAnalysisReportParamDto param) {
 
         try {
             RoleInfo role = getRoleInfo();
@@ -240,7 +228,7 @@ public class DailyExamWrongAnalysisController {
                 return HttpResult.success(noShow);
             }
 
-            LocalDate[] range = resolveDateRange(timeType, startDate, endDate);
+            LocalDate[] range = resolveDateRange(param);
 
             BaseCheckCategory level1Cat = baseCheckCategoryService.selectBaseCheckCategoryById(categoryId);
             if (level1Cat == null) {
@@ -264,7 +252,7 @@ public class DailyExamWrongAnalysisController {
             result.put("categoryId", categoryId);
             result.put("categoryName", level1Cat.getName());
 
-            boolean byMonth = "year".equals(timeType);
+            boolean byMonth = "YEAR".equals(param != null ? param.getDateRangeQueryType() : null);
             List<String> xAxis = buildXAxis(range[0], range[1], byMonth);
             SimpleDateFormat sdf = new SimpleDateFormat(byMonth ? "yyyy-MM" : "yyyy-MM-dd");
 
@@ -669,26 +657,31 @@ public class DailyExamWrongAnalysisController {
     }
 
     /**
-     * 根据时间类型计算起止日期
+     * 根据 SysAnalysisReportParamDto 计算起止日期
+     * YEAR → 全年；QUARTER → 指定季度；MONTH → 指定月份；默认 → 当月
      */
-    private LocalDate[] resolveDateRange(String timeType, String startDate, String endDate) {
+    private LocalDate[] resolveDateRange(SysAnalysisReportParamDto param) {
         LocalDate today = LocalDate.now();
-        LocalDate start;
-        LocalDate end = today;
-        switch (timeType == null ? "month" : timeType) {
-            case "year":
-                start = today.withDayOfYear(1);
-                end = today.withMonth(12).withDayOfMonth(31);
+        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":
+                range = DateRangeQueryUtils.getYearRange(year, null);
                 break;
-            case "custom":
-                start = (startDate != null) ? LocalDate.parse(startDate) : today.withDayOfMonth(1);
-                end = (endDate != null) ? LocalDate.parse(endDate) : today;
+            case "QUARTER":
+                int quarter = (param.getQuarter() != null) ? param.getQuarter() : 1;
+                range = DateRangeQueryUtils.getQuarterRange(year, quarter, null);
                 break;
-            default: // month
-                start = today.withDayOfMonth(1);
+            default: // MONTH
+                int month = (param != null && param.getMonth() != null) ? param.getMonth() : today.getMonthValue();
+                range = DateRangeQueryUtils.getMonthRange(year, month, null);
                 break;
         }
-        return new LocalDate[]{start, end};
+        return new LocalDate[]{
+                ((java.sql.Date) range.getStartDate()).toLocalDate(),
+                ((java.sql.Date) range.getEndDate()).toLocalDate()
+        };
     }
 
     /**