质控分析报告-质控活动

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysCheckAnalysisReportController.java

@@ -0,0 +1,68 @@
+package com.sundot.airport.web.controller.system;
+
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.check.service.ICheckLargeScreenService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.SysAnalysisReportDateRangeDto;
+import com.sundot.airport.common.core.domain.SysAnalysisReportParamDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDistributionDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportDto;
+import com.sundot.airport.common.enums.DateRangeQueryTypeEnum;
+import com.sundot.airport.common.utils.DateRangeQueryUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 质控分析报告
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/analysisReport")
+public class SysCheckAnalysisReportController extends BaseController {
+
+    @Autowired
+    private ICheckLargeScreenService checkLargeScreenService;
+
+    /**
+     * 质控活动
+     */
+    @PostMapping("/check")
+    public AjaxResult checkAnalysisReport(@RequestBody SysAnalysisReportParamDto paramDto) {
+        List<SysAnalysisReportDateRangeDto> dateRangeList = new ArrayList<>();
+        if (StrUtil.equals(DateRangeQueryTypeEnum.YEAR.getCode(), paramDto.getDateRangeQueryType())) {
+            dateRangeList.add(DateRangeQueryUtils.getPreviousYearRange(paramDto.getYear()));
+            dateRangeList.add(DateRangeQueryUtils.getYearRange(paramDto.getYear(), null));
+        } else if (StrUtil.equals(DateRangeQueryTypeEnum.QUARTER.getCode(), paramDto.getDateRangeQueryType())) {
+            dateRangeList.add(DateRangeQueryUtils.getLastYearSameQuarterRange(paramDto.getYear(), paramDto.getQuarter()));
+            dateRangeList.add(DateRangeQueryUtils.getPreviousQuarterRange(paramDto.getYear(), paramDto.getQuarter()));
+            dateRangeList.add(DateRangeQueryUtils.getQuarterRange(paramDto.getYear(), paramDto.getQuarter(), null));
+        } else if (StrUtil.equals(DateRangeQueryTypeEnum.MONTH.getCode(), paramDto.getDateRangeQueryType())) {
+            dateRangeList.add(DateRangeQueryUtils.getLastYearSameMonthRange(paramDto.getYear(), paramDto.getMonth()));
+            dateRangeList.add(DateRangeQueryUtils.getPreviousMonthRange(paramDto.getYear(), paramDto.getMonth()));
+            dateRangeList.add(DateRangeQueryUtils.getMonthRange(paramDto.getYear(), paramDto.getMonth(), null));
+        }
+        paramDto.setDateRangeList(dateRangeList);
+        SysCheckAnalysisReportDto result = checkLargeScreenService.checkAnalysisReport(paramDto);
+        return success(result);
+    }
+
+    /**
+     * 质控活动-问题分布统计
+     */
+    @GetMapping("/checkProblemDistribution")
+    public AjaxResult checkAnalysisReportCheckProblemDistributionDto(BaseLargeScreenQueryParamDto paramDto) {
+        SysCheckAnalysisReportCheckProblemDistributionDto result = checkLargeScreenService.getCheckProblemDistribution(paramDto);
+        return success(result);
+    }
+
+}

airport-check/src/main/java/com/sundot/airport/check/mapper/CheckLargeScreenMapper.java

@@ -17,7 +17,10 @@ import com.sundot.airport.check.domain.CheckLargeScreenProblemQueryParamDto;
 import com.sundot.airport.check.domain.CheckLargeScreenProblemTrendDto;
 import com.sundot.airport.check.domain.CheckTask;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemCorrectionItemDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDistributionItemDto;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -259,4 +262,28 @@ public interface CheckLargeScreenMapper {
      */
     public Integer checkCorrectionCount(BaseLargeScreenQueryParamDto dto);
 
+    /**
+     * 问题发现总数
+     *
+     * @param dto 大屏查询参数
+     * @return 问题发现总数
+     */
+    public BigDecimal problemDistributionTotal(BaseLargeScreenQueryParamDto dto);
+
+    /**
+     * 问题分布统计
+     *
+     * @param dto 大屏查询参数
+     * @return 问题分布统计
+     */
+    public List<SysCheckAnalysisReportCheckProblemDistributionItemDto> problemDistributionStatistics(BaseLargeScreenQueryParamDto dto);
+
+    /**
+     * 问题整改统计
+     *
+     * @param dto 大屏查询参数
+     * @return 问题整改统计
+     */
+    public List<SysCheckAnalysisReportCheckProblemCorrectionItemDto> problemCorrectionStatistics(BaseLargeScreenQueryParamDto dto);
+
 }

airport-check/src/main/java/com/sundot/airport/check/service/ICheckLargeScreenService.java

@@ -15,6 +15,9 @@ import com.sundot.airport.check.domain.CheckTask;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
 import com.sundot.airport.common.core.domain.CheckLargeScreenHomePageItemDto;
 import com.sundot.airport.common.core.domain.CheckLargeScreenHomePageRankingDto;
+import com.sundot.airport.common.core.domain.SysAnalysisReportParamDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDistributionDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportDto;
 import com.sundot.airport.common.core.domain.SysHomeReportDetailDto;
 import com.sundot.airport.common.core.domain.SysLargeScreenDetailDto;
 
@@ -203,4 +206,20 @@ public interface ICheckLargeScreenService {
      * @return 首页报表-巡检合格率数据
      */
     public SysHomeReportDetailDto checkData(BaseLargeScreenQueryParamDto dto);
+
+    /**
+     * 质控分析报告-质控活动
+     *
+     * @param paramDto 质控分析报告-质控活动查询参数
+     * @return 质控分析报告-质控活动
+     */
+    public SysCheckAnalysisReportDto checkAnalysisReport(SysAnalysisReportParamDto paramDto);
+
+    /**
+     * 质控分析报告-质控活动-问题分布统计
+     *
+     * @param paramDto 查询参数
+     * @return 质控分析报告-质控活动-问题分布统计
+     */
+    public SysCheckAnalysisReportCheckProblemDistributionDto getCheckProblemDistribution(BaseLargeScreenQueryParamDto paramDto);
 }

airport-check/src/main/java/com/sundot/airport/check/service/impl/CheckLargeScreenServiceImpl.java

@@ -16,6 +16,8 @@ import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
 import com.sundot.airport.check.domain.CheckLargeScreenHomePageCheckCorrectionSqlDto;
 import com.sundot.airport.check.domain.CheckLargeScreenHomePageCheckRecordSqlDto;
 import com.sundot.airport.check.domain.CheckLargeScreenHomePageDto;
+import com.sundot.airport.common.core.domain.CheckLargeScreenHomePageItemDto;
+import com.sundot.airport.common.core.domain.CheckLargeScreenHomePageRankingDto;
 import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteDto;
 import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteItemDto;
 import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteUserDto;
@@ -29,9 +31,20 @@ import com.sundot.airport.check.mapper.CheckLargeScreenMapper;
 import com.sundot.airport.check.service.ICheckLargeScreenService;
 import com.sundot.airport.common.constant.CacheConstants;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
-import com.sundot.airport.common.core.domain.CheckLargeScreenHomePageItemDto;
-import com.sundot.airport.common.core.domain.CheckLargeScreenHomePageRankingDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemCorrectionDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemCorrectionItemDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDistributionItemDto;
 import com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto;
+import com.sundot.airport.common.core.domain.SysAnalysisReportCompareItemDto;
+import com.sundot.airport.common.core.domain.SysAnalysisReportDateRangeDto;
+import com.sundot.airport.common.core.domain.SysAnalysisReportParamDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDiscoveryDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDiscoveryItemDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDistributionDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckTaskDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckTaskItemDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckTaskTypeItemDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportDto;
 import com.sundot.airport.common.core.domain.SysHomeReportDetailDto;
 import com.sundot.airport.common.core.domain.SysLargeScreenDetailDto;
 import com.sundot.airport.common.core.domain.entity.SysDept;
@@ -41,6 +54,9 @@ import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.core.redis.RedisCache;
 import com.sundot.airport.common.enums.CheckLargeScreenCorrectionTypeEnum;
 import com.sundot.airport.common.enums.CheckLevelEnum;
+import com.sundot.airport.common.enums.CheckTaskTypeEnum;
+import com.sundot.airport.common.enums.CompareResultTypeEnum;
+import com.sundot.airport.common.enums.CompareTypeEnum;
 import com.sundot.airport.common.enums.DeptType;
 import com.sundot.airport.common.enums.DeptTypeEnum;
 import com.sundot.airport.common.enums.HomePageQueryEnum;
@@ -2714,4 +2730,403 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         return result;
     }
 
+    /**
+     * 质控分析报告-质控活动
+     *
+     * @param paramDto 质控分析报告-质控活动查询参数
+     * @return 质控分析报告-质控活动
+     */
+    @Override
+    public SysCheckAnalysisReportDto checkAnalysisReport(SysAnalysisReportParamDto paramDto) {
+        SysCheckAnalysisReportDto result = new SysCheckAnalysisReportDto();
+        result.setCheckTaskDto(getCheckTaskDto(paramDto));
+        result.setCheckProblemDiscoveryDto(getCheckProblemDiscoveryDto(paramDto));
+        result.setCheckProblemDistributionDto(getCheckProblemDistributionDto(paramDto));
+        result.setCheckProblemCorrectionDto(getCheckProblemCorrectionDto(paramDto));
+        return result;
+    }
+
+    /**
+     * 获取任务计划安排统计
+     *
+     * @param paramDto 质控分析报告-任务计划安排统计查询参数
+     * @return 任务计划安排统计
+     */
+    private SysCheckAnalysisReportCheckTaskDto getCheckTaskDto(SysAnalysisReportParamDto paramDto) {
+        SysCheckAnalysisReportCheckTaskDto checkTaskDto = new SysCheckAnalysisReportCheckTaskDto();
+        List<SysCheckAnalysisReportCheckTaskItemDto> checkTaskItemDtoList = new ArrayList<>();
+        paramDto.getDateRangeList().forEach(dateRange -> {
+            CheckLargeScreenPlanQueryParamDto dto = new CheckLargeScreenPlanQueryParamDto();
+            dto.setStartDate(dateRange.getStartDate());
+            dto.setEndDate(dateRange.getEndDate());
+            List<CheckTask> checkTaskList = checkLargeScreenMapper.planStatistics(dto);
+            Map<String, Long> map = checkTaskList.stream().collect(Collectors.groupingBy(CheckTask::getCheckCategory, Collectors.counting()));
+
+            SysCheckAnalysisReportCheckTaskItemDto itemDtoSpecialTask = new SysCheckAnalysisReportCheckTaskItemDto();
+            itemDtoSpecialTask.setStartDate(dateRange.getStartDate());
+            itemDtoSpecialTask.setEndDate(dateRange.getEndDate());
+            itemDtoSpecialTask.setDesc(dateRange.getDesc());
+            itemDtoSpecialTask.setTag(dateRange.getTag());
+            itemDtoSpecialTask.setTagDesc(dateRange.getTagDesc());
+            itemDtoSpecialTask.setType(CheckTaskTypeEnum.SPECIAL_TASK.getCode());
+            itemDtoSpecialTask.setTypeDesc(CheckTaskTypeEnum.SPECIAL_TASK.getDesc());
+            itemDtoSpecialTask.setCount(map.get(CheckTaskTypeEnum.SPECIAL_TASK.getCode()) == null ? BigDecimal.ZERO : BigDecimal.valueOf(map.get(CheckTaskTypeEnum.SPECIAL_TASK.getCode())));
+            checkTaskItemDtoList.add(itemDtoSpecialTask);
+            SysCheckAnalysisReportCheckTaskItemDto itemDtoDailyTask = new SysCheckAnalysisReportCheckTaskItemDto();
+            itemDtoDailyTask.setStartDate(dateRange.getStartDate());
+            itemDtoDailyTask.setEndDate(dateRange.getEndDate());
+            itemDtoDailyTask.setDesc(dateRange.getDesc());
+            itemDtoDailyTask.setTag(dateRange.getTag());
+            itemDtoDailyTask.setTagDesc(dateRange.getTagDesc());
+            itemDtoDailyTask.setType(CheckTaskTypeEnum.DAILY_TASK.getCode());
+            itemDtoDailyTask.setTypeDesc(CheckTaskTypeEnum.DAILY_TASK.getDesc());
+            itemDtoDailyTask.setCount(map.get(CheckTaskTypeEnum.DAILY_TASK.getCode()) == null ? BigDecimal.ZERO : BigDecimal.valueOf(map.get(CheckTaskTypeEnum.DAILY_TASK.getCode())));
+            checkTaskItemDtoList.add(itemDtoDailyTask);
+        });
+        checkTaskDto.setCheckTaskItemDtoList(checkTaskItemDtoList);
+
+        List<SysCheckAnalysisReportCheckTaskTypeItemDto> checkTaskTypeItemDtoList = new ArrayList<>();
+        List<SysCheckAnalysisReportCheckTaskItemDto> specialTaskList = checkTaskItemDtoList.stream().filter(item -> CheckTaskTypeEnum.SPECIAL_TASK.getCode().equals(item.getType())).collect(Collectors.toList());
+        List<SysCheckAnalysisReportCheckTaskItemDto> dailyTaskList = checkTaskItemDtoList.stream().filter(item -> CheckTaskTypeEnum.DAILY_TASK.getCode().equals(item.getType())).collect(Collectors.toList());
+        BigDecimal specialTaskCurrentCount = specialTaskList.stream().filter(item -> CompareTypeEnum.CURRENT.getCode().equals(item.getTag())).findFirst().map(SysCheckAnalysisReportCheckTaskItemDto::getCount).orElse(BigDecimal.ZERO);
+        BigDecimal specialTaskYearOnYearCount = specialTaskList.stream().filter(item -> CompareTypeEnum.YEAR_ON_YEAR.getCode().equals(item.getTag())).findFirst().map(SysCheckAnalysisReportCheckTaskItemDto::getCount).orElse(BigDecimal.ZERO);
+        SysCheckAnalysisReportCheckTaskItemDto specialTaskRingRatioCheckTaskItemDto = specialTaskList.stream().filter(item -> CompareTypeEnum.RING_RATIO.getCode().equals(item.getTag())).findFirst().orElse(null);
+        BigDecimal specialTaskRingRatioCount = specialTaskRingRatioCheckTaskItemDto != null ? specialTaskRingRatioCheckTaskItemDto.getCount() : BigDecimal.ZERO;
+        BigDecimal dailyTaskCurrentCount = dailyTaskList.stream().filter(item -> CompareTypeEnum.CURRENT.getCode().equals(item.getTag())).findFirst().map(SysCheckAnalysisReportCheckTaskItemDto::getCount).orElse(BigDecimal.ZERO);
+        BigDecimal dailyTaskYearOnYearCount = dailyTaskList.stream().filter(item -> CompareTypeEnum.YEAR_ON_YEAR.getCode().equals(item.getTag())).findFirst().map(SysCheckAnalysisReportCheckTaskItemDto::getCount).orElse(BigDecimal.ZERO);
+        SysCheckAnalysisReportCheckTaskItemDto dailyTaskRingRatioCheckTaskItemDto = dailyTaskList.stream().filter(item -> CompareTypeEnum.RING_RATIO.getCode().equals(item.getTag())).findFirst().orElse(null);
+        BigDecimal dailyTaskRingRatioCount = dailyTaskRingRatioCheckTaskItemDto != null ? dailyTaskRingRatioCheckTaskItemDto.getCount() : BigDecimal.ZERO;
+
+        SysCheckAnalysisReportCheckTaskTypeItemDto checkTaskTypeItemDtoSpecialTask = new SysCheckAnalysisReportCheckTaskTypeItemDto();
+        checkTaskTypeItemDtoSpecialTask.setType(CheckTaskTypeEnum.SPECIAL_TASK.getCode());
+        checkTaskTypeItemDtoSpecialTask.setTypeDesc(CheckTaskTypeEnum.SPECIAL_TASK.getDesc());
+        checkTaskTypeItemDtoSpecialTask.setCount(specialTaskCurrentCount);
+        List<SysAnalysisReportCompareItemDto> specialTaskItemDtoList = new ArrayList<>();
+        checkTaskTypeItemDtoSpecialTask.setCompareItemDtoList(specialTaskItemDtoList);
+        SysCheckAnalysisReportCheckTaskTypeItemDto checkTaskTypeItemDtoDailyTask = new SysCheckAnalysisReportCheckTaskTypeItemDto();
+        checkTaskTypeItemDtoDailyTask.setType(CheckTaskTypeEnum.DAILY_TASK.getCode());
+        checkTaskTypeItemDtoDailyTask.setTypeDesc(CheckTaskTypeEnum.DAILY_TASK.getDesc());
+        checkTaskTypeItemDtoDailyTask.setCount(dailyTaskCurrentCount);
+        List<SysAnalysisReportCompareItemDto> dailyTaskItemDtoList = new ArrayList<>();
+        checkTaskTypeItemDtoDailyTask.setCompareItemDtoList(dailyTaskItemDtoList);
+
+        SysAnalysisReportCompareItemDto specialTaskYearOnYearItemDto = new SysAnalysisReportCompareItemDto();
+        specialTaskYearOnYearItemDto.setCompareType(CompareTypeEnum.YEAR_ON_YEAR.getCode());
+        specialTaskYearOnYearItemDto.setCompareTypeDesc(CompareTypeEnum.YEAR_ON_YEAR.getDesc());
+        BigDecimal subtractSpecialTaskYearOnYear = specialTaskCurrentCount.subtract(specialTaskYearOnYearCount);
+        if (subtractSpecialTaskYearOnYear.compareTo(BigDecimal.ZERO) > 0) {
+            specialTaskYearOnYearItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+            specialTaskYearOnYearItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+            specialTaskYearOnYearItemDto.setProportion(specialTaskYearOnYearCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractSpecialTaskYearOnYear.divide(specialTaskYearOnYearCount, 4, RoundingMode.HALF_UP));
+            specialTaskYearOnYearItemDto.setProportionDesc(specialTaskYearOnYearItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : specialTaskYearOnYearItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+        } else if (subtractSpecialTaskYearOnYear.compareTo(BigDecimal.ZERO) < 0) {
+            specialTaskYearOnYearItemDto.setCompareResultType(CompareResultTypeEnum.DECLINE.getCode());
+            specialTaskYearOnYearItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.DECLINE.getDesc());
+            specialTaskYearOnYearItemDto.setProportion(specialTaskYearOnYearCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractSpecialTaskYearOnYear.abs().divide(specialTaskYearOnYearCount, 4, RoundingMode.HALF_UP));
+            specialTaskYearOnYearItemDto.setProportionDesc(specialTaskYearOnYearItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : specialTaskYearOnYearItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+        } else {
+            specialTaskYearOnYearItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+            specialTaskYearOnYearItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+            specialTaskYearOnYearItemDto.setProportion(BigDecimal.ZERO);
+            specialTaskYearOnYearItemDto.setProportionDesc("0%");
+        }
+        specialTaskItemDtoList.add(specialTaskYearOnYearItemDto);
+        if (specialTaskRingRatioCheckTaskItemDto != null) {
+            SysAnalysisReportCompareItemDto specialTaskRingRatioItemDto = new SysAnalysisReportCompareItemDto();
+            specialTaskRingRatioItemDto.setCompareType(CompareTypeEnum.RING_RATIO.getCode());
+            specialTaskRingRatioItemDto.setCompareTypeDesc(CompareTypeEnum.RING_RATIO.getDesc());
+            BigDecimal subtractSpecialTaskRingRatio = specialTaskCurrentCount.subtract(specialTaskRingRatioCount);
+            if (subtractSpecialTaskRingRatio.compareTo(BigDecimal.ZERO) > 0) {
+                specialTaskRingRatioItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+                specialTaskRingRatioItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+                specialTaskRingRatioItemDto.setProportion(specialTaskRingRatioCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractSpecialTaskRingRatio.divide(specialTaskRingRatioCount, 4, RoundingMode.HALF_UP));
+                specialTaskRingRatioItemDto.setProportionDesc(specialTaskRingRatioItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : specialTaskRingRatioItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+            } else if (subtractSpecialTaskRingRatio.compareTo(BigDecimal.ZERO) < 0) {
+                specialTaskRingRatioItemDto.setCompareResultType(CompareResultTypeEnum.DECLINE.getCode());
+                specialTaskRingRatioItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.DECLINE.getDesc());
+                specialTaskRingRatioItemDto.setProportion(specialTaskRingRatioCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractSpecialTaskRingRatio.abs().divide(specialTaskRingRatioCount, 4, RoundingMode.HALF_UP));
+                specialTaskRingRatioItemDto.setProportionDesc(specialTaskRingRatioItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : specialTaskRingRatioItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+            } else {
+                specialTaskRingRatioItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+                specialTaskRingRatioItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+                specialTaskRingRatioItemDto.setProportion(BigDecimal.ZERO);
+                specialTaskRingRatioItemDto.setProportionDesc("0%");
+            }
+            specialTaskItemDtoList.add(specialTaskRingRatioItemDto);
+        }
+
+        SysAnalysisReportCompareItemDto dailyTaskYearOnYearItemDto = new SysAnalysisReportCompareItemDto();
+        dailyTaskYearOnYearItemDto.setCompareType(CompareTypeEnum.YEAR_ON_YEAR.getCode());
+        dailyTaskYearOnYearItemDto.setCompareTypeDesc(CompareTypeEnum.YEAR_ON_YEAR.getDesc());
+        BigDecimal subtractDailyTaskYearOnYear = dailyTaskCurrentCount.subtract(dailyTaskYearOnYearCount);
+        if (subtractDailyTaskYearOnYear.compareTo(BigDecimal.ZERO) > 0) {
+            dailyTaskYearOnYearItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+            dailyTaskYearOnYearItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+            dailyTaskYearOnYearItemDto.setProportion(dailyTaskYearOnYearCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractDailyTaskYearOnYear.divide(dailyTaskYearOnYearCount, 4, RoundingMode.HALF_UP));
+            dailyTaskYearOnYearItemDto.setProportionDesc(dailyTaskYearOnYearItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : dailyTaskYearOnYearItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+        } else if (subtractDailyTaskYearOnYear.compareTo(BigDecimal.ZERO) < 0) {
+            dailyTaskYearOnYearItemDto.setCompareResultType(CompareResultTypeEnum.DECLINE.getCode());
+            dailyTaskYearOnYearItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.DECLINE.getDesc());
+            dailyTaskYearOnYearItemDto.setProportion(dailyTaskYearOnYearCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractDailyTaskYearOnYear.abs().divide(dailyTaskYearOnYearCount, 4, RoundingMode.HALF_UP));
+            dailyTaskYearOnYearItemDto.setProportionDesc(dailyTaskYearOnYearItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : dailyTaskYearOnYearItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+        } else {
+            dailyTaskYearOnYearItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+            dailyTaskYearOnYearItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+            dailyTaskYearOnYearItemDto.setProportion(BigDecimal.ZERO);
+            dailyTaskYearOnYearItemDto.setProportionDesc("0%");
+        }
+        dailyTaskItemDtoList.add(dailyTaskYearOnYearItemDto);
+        if (dailyTaskRingRatioCheckTaskItemDto != null) {
+            SysAnalysisReportCompareItemDto dailyTaskRingRatioItemDto = new SysAnalysisReportCompareItemDto();
+            dailyTaskRingRatioItemDto.setCompareType(CompareTypeEnum.RING_RATIO.getCode());
+            dailyTaskRingRatioItemDto.setCompareTypeDesc(CompareTypeEnum.RING_RATIO.getDesc());
+            BigDecimal subtractDailyTaskRingRatio = dailyTaskCurrentCount.subtract(dailyTaskRingRatioCount);
+            if (subtractDailyTaskRingRatio.compareTo(BigDecimal.ZERO) > 0) {
+                dailyTaskRingRatioItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+                dailyTaskRingRatioItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+                dailyTaskRingRatioItemDto.setProportion(dailyTaskRingRatioCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractDailyTaskRingRatio.divide(dailyTaskRingRatioCount, 4, RoundingMode.HALF_UP));
+                dailyTaskRingRatioItemDto.setProportionDesc(dailyTaskRingRatioItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : dailyTaskRingRatioItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+            } else if (subtractDailyTaskRingRatio.compareTo(BigDecimal.ZERO) < 0) {
+                dailyTaskRingRatioItemDto.setCompareResultType(CompareResultTypeEnum.DECLINE.getCode());
+                dailyTaskRingRatioItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.DECLINE.getDesc());
+                dailyTaskRingRatioItemDto.setProportion(dailyTaskRingRatioCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractDailyTaskRingRatio.abs().divide(dailyTaskRingRatioCount, 4, RoundingMode.HALF_UP));
+                dailyTaskRingRatioItemDto.setProportionDesc(dailyTaskRingRatioItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : dailyTaskRingRatioItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+            } else {
+                dailyTaskRingRatioItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+                dailyTaskRingRatioItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+                dailyTaskRingRatioItemDto.setProportion(BigDecimal.ZERO);
+                dailyTaskRingRatioItemDto.setProportionDesc("0%");
+            }
+            dailyTaskItemDtoList.add(dailyTaskRingRatioItemDto);
+        }
+        checkTaskTypeItemDtoList.add(checkTaskTypeItemDtoSpecialTask);
+        checkTaskTypeItemDtoList.add(checkTaskTypeItemDtoDailyTask);
+        checkTaskDto.setCheckTaskTypeItemDtoList(checkTaskTypeItemDtoList);
+
+        List<String> descResultList = new ArrayList<>();
+        checkTaskTypeItemDtoList.forEach(checkTaskTypeItemDto -> {
+            String descOne = checkTaskTypeItemDto.getTypeDesc() + ":发布" + checkTaskTypeItemDto.getCount() + "次,";
+            List<String> descList = new ArrayList<>();
+            checkTaskTypeItemDto.getCompareItemDtoList().forEach(item -> {
+                descList.add(item.getCompareTypeDesc() + item.getCompareResultTypeDesc() + item.getProportionDesc());
+            });
+            String descTwo = String.join(",", descList);
+            descResultList.add(descOne + descTwo);
+        });
+        String desc = String.join(";\n", descResultList);
+        checkTaskDto.setDesc(desc);
+
+        return checkTaskDto;
+    }
+
+    /**
+     * 获取问题发现统计
+     *
+     * @param paramDto 质控分析报告-问题发现统计查询参数
+     * @return 问题发现统计
+     */
+    private SysCheckAnalysisReportCheckProblemDiscoveryDto getCheckProblemDiscoveryDto(SysAnalysisReportParamDto paramDto) {
+        SysCheckAnalysisReportCheckProblemDiscoveryDto checkProblemDiscoveryDto = new SysCheckAnalysisReportCheckProblemDiscoveryDto();
+        List<SysCheckAnalysisReportCheckProblemDiscoveryItemDto> checkProblemDiscoveryItemDtoList = new ArrayList<>();
+        paramDto.getDateRangeList().forEach(dateRange -> {
+            CheckLargeScreenPlanQueryParamDto dto = new CheckLargeScreenPlanQueryParamDto();
+            dto.setStartDate(dateRange.getStartDate());
+            dto.setEndDate(dateRange.getEndDate());
+            BigDecimal count = checkLargeScreenMapper.problemDistributionTotal(dto);
+            SysCheckAnalysisReportCheckProblemDiscoveryItemDto checkProblemDiscoveryItemDto = new SysCheckAnalysisReportCheckProblemDiscoveryItemDto();
+            checkProblemDiscoveryItemDto.setStartDate(dateRange.getStartDate());
+            checkProblemDiscoveryItemDto.setEndDate(dateRange.getEndDate());
+            checkProblemDiscoveryItemDto.setDesc(dateRange.getDesc());
+            checkProblemDiscoveryItemDto.setTag(dateRange.getTag());
+            checkProblemDiscoveryItemDto.setTagDesc(dateRange.getTagDesc());
+            checkProblemDiscoveryItemDto.setCount(count);
+            checkProblemDiscoveryItemDtoList.add(checkProblemDiscoveryItemDto);
+        });
+        checkProblemDiscoveryDto.setCheckProblemDiscoveryItemDtoList(checkProblemDiscoveryItemDtoList);
+
+        BigDecimal currentCount = checkProblemDiscoveryItemDtoList.stream().filter(item -> CompareTypeEnum.CURRENT.getCode().equals(item.getTag())).findFirst().map(SysCheckAnalysisReportCheckProblemDiscoveryItemDto::getCount).orElse(BigDecimal.ZERO);
+        checkProblemDiscoveryDto.setCount(currentCount);
+        BigDecimal yearOnYearCount = checkProblemDiscoveryItemDtoList.stream().filter(item -> CompareTypeEnum.YEAR_ON_YEAR.getCode().equals(item.getTag())).findFirst().map(SysCheckAnalysisReportCheckProblemDiscoveryItemDto::getCount).orElse(BigDecimal.ZERO);
+        SysCheckAnalysisReportCheckProblemDiscoveryItemDto checkProblemDiscoveryRingRatioItemDto = checkProblemDiscoveryItemDtoList.stream().filter(item -> CompareTypeEnum.RING_RATIO.getCode().equals(item.getTag())).findFirst().orElse(null);
+        BigDecimal ringRatioCount = checkProblemDiscoveryRingRatioItemDto != null ? checkProblemDiscoveryRingRatioItemDto.getCount() : BigDecimal.ZERO;
+
+        List<SysAnalysisReportCompareItemDto> compareItemDtoList = new ArrayList<>();
+        checkProblemDiscoveryDto.setCompareItemDtoList(compareItemDtoList);
+        SysAnalysisReportCompareItemDto yearOnYearItemDto = new SysAnalysisReportCompareItemDto();
+        yearOnYearItemDto.setCompareType(CompareTypeEnum.YEAR_ON_YEAR.getCode());
+        yearOnYearItemDto.setCompareTypeDesc(CompareTypeEnum.YEAR_ON_YEAR.getDesc());
+        BigDecimal subtractYearOnYear = currentCount.subtract(yearOnYearCount);
+        if (subtractYearOnYear.compareTo(BigDecimal.ZERO) > 0) {
+            yearOnYearItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+            yearOnYearItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+            yearOnYearItemDto.setProportion(yearOnYearCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractYearOnYear.divide(yearOnYearCount, 4, RoundingMode.HALF_UP));
+            yearOnYearItemDto.setProportionDesc(yearOnYearItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : yearOnYearItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+        } else if (subtractYearOnYear.compareTo(BigDecimal.ZERO) < 0) {
+            yearOnYearItemDto.setCompareResultType(CompareResultTypeEnum.DECLINE.getCode());
+            yearOnYearItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.DECLINE.getDesc());
+            yearOnYearItemDto.setProportion(yearOnYearCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractYearOnYear.abs().divide(yearOnYearCount, 4, RoundingMode.HALF_UP));
+            yearOnYearItemDto.setProportionDesc(yearOnYearItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : yearOnYearItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+        } else {
+            yearOnYearItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+            yearOnYearItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+            yearOnYearItemDto.setProportion(BigDecimal.ZERO);
+            yearOnYearItemDto.setProportionDesc("0%");
+        }
+        compareItemDtoList.add(yearOnYearItemDto);
+        if (checkProblemDiscoveryRingRatioItemDto != null) {
+            SysAnalysisReportCompareItemDto ringRatioItemDto = new SysAnalysisReportCompareItemDto();
+            ringRatioItemDto.setCompareType(CompareTypeEnum.RING_RATIO.getCode());
+            ringRatioItemDto.setCompareTypeDesc(CompareTypeEnum.RING_RATIO.getDesc());
+            BigDecimal subtractSpecialTaskRingRatio = currentCount.subtract(ringRatioCount);
+            if (subtractSpecialTaskRingRatio.compareTo(BigDecimal.ZERO) > 0) {
+                ringRatioItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+                ringRatioItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+                ringRatioItemDto.setProportion(ringRatioCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractSpecialTaskRingRatio.divide(ringRatioCount, 4, RoundingMode.HALF_UP));
+                ringRatioItemDto.setProportionDesc(ringRatioItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : ringRatioItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+            } else if (subtractSpecialTaskRingRatio.compareTo(BigDecimal.ZERO) < 0) {
+                ringRatioItemDto.setCompareResultType(CompareResultTypeEnum.DECLINE.getCode());
+                ringRatioItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.DECLINE.getDesc());
+                ringRatioItemDto.setProportion(ringRatioCount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : subtractSpecialTaskRingRatio.abs().divide(ringRatioCount, 4, RoundingMode.HALF_UP));
+                ringRatioItemDto.setProportionDesc(ringRatioItemDto.getProportion().compareTo(BigDecimal.ZERO) == 0 ? "--%" : ringRatioItemDto.getProportion().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%");
+            } else {
+                ringRatioItemDto.setCompareResultType(CompareResultTypeEnum.RISE.getCode());
+                ringRatioItemDto.setCompareResultTypeDesc(CompareResultTypeEnum.RISE.getDesc());
+                ringRatioItemDto.setProportion(BigDecimal.ZERO);
+                ringRatioItemDto.setProportionDesc("0%");
+            }
+            compareItemDtoList.add(ringRatioItemDto);
+        }
+
+        String descOne = "共发现问题" + checkProblemDiscoveryDto.getCount() + "个,";
+        List<String> descList = new ArrayList<>();
+        checkProblemDiscoveryDto.getCompareItemDtoList().forEach(item -> descList.add(item.getCompareTypeDesc() + item.getCompareResultTypeDesc() + item.getProportionDesc()));
+        String descTwo = String.join(",", descList);
+        checkProblemDiscoveryDto.setDesc(descOne + descTwo);
+        return checkProblemDiscoveryDto;
+    }
+
+    /**
+     * 获取问题分布统计
+     *
+     * @param paramDto 质控分析报告-问题分布统计查询参数
+     * @return 问题分布统计
+     */
+    private SysCheckAnalysisReportCheckProblemDistributionDto getCheckProblemDistributionDto(SysAnalysisReportParamDto paramDto) {
+        SysCheckAnalysisReportCheckProblemDistributionDto checkProblemDistributionDto = new SysCheckAnalysisReportCheckProblemDistributionDto();
+        SysAnalysisReportDateRangeDto currentDateRangeDto = paramDto.getDateRangeList().stream().filter(dateRange -> StrUtil.equals(CompareTypeEnum.CURRENT.getCode(), dateRange.getTag())).findFirst().orElse(null);
+        BaseLargeScreenQueryParamDto queryParamDto = new BaseLargeScreenQueryParamDto();
+        queryParamDto.setStartDate(currentDateRangeDto.getStartDate());
+        queryParamDto.setEndDate(currentDateRangeDto.getEndDate());
+        List<SysCheckAnalysisReportCheckProblemDistributionItemDto> checkProblemDistributionItemDtoList = checkLargeScreenMapper.problemDistributionStatistics(queryParamDto);
+        checkProblemDistributionDto.setCheckProblemDistributionItemDtoList(checkProblemDistributionItemDtoList);
+        if (CollUtil.isEmpty(checkProblemDistributionItemDtoList)) {
+            return null;
+        }
+
+        StringBuilder desc = new StringBuilder();
+        String formatOne = "当前安检质控中,%s类型问题的数量最多(%s件),是问题集中的主要类型";
+        desc.append(String.format(formatOne, checkProblemDistributionItemDtoList.get(0).getName(), checkProblemDistributionItemDtoList.get(0).getTotal()));
+        if (checkProblemDistributionItemDtoList.size() > 1) {
+            List<String> list = new ArrayList<>();
+            checkProblemDistributionItemDtoList = checkProblemDistributionItemDtoList.stream().skip(1).collect(Collectors.toList());
+            checkProblemDistributionItemDtoList = checkProblemDistributionItemDtoList.stream().limit(2).collect(Collectors.toList());
+            checkProblemDistributionItemDtoList.forEach(sysCheckAnalysisReportCheckProblemDistributionItemDto -> list.add(sysCheckAnalysisReportCheckProblemDistributionItemDto.getName() + "(" + sysCheckAnalysisReportCheckProblemDistributionItemDto.getTotal() + "件)"));
+            String join = String.join("、", list);
+            String formatTwo = ";其次是%s";
+            desc.append(String.format(formatTwo, join));
+        }
+        checkProblemDistributionDto.setDesc(desc.length() == 0 ? null : desc.toString());
+
+        return checkProblemDistributionDto;
+    }
+
+    /**
+     * 获取问题整改统计
+     *
+     * @param paramDto 质控分析报告-问题整改统计查询参数
+     * @return 问题整改统计
+     */
+    private SysCheckAnalysisReportCheckProblemCorrectionDto getCheckProblemCorrectionDto(SysAnalysisReportParamDto paramDto) {
+        SysCheckAnalysisReportCheckProblemCorrectionDto checkProblemCorrectionDto = new SysCheckAnalysisReportCheckProblemCorrectionDto();
+        List<SysCheckAnalysisReportCheckProblemCorrectionItemDto> checkProblemCorrectionItemDtoList = new ArrayList<>();
+        SysAnalysisReportDateRangeDto currentDateRangeDto = paramDto.getDateRangeList().stream().filter(dateRange -> StrUtil.equals(CompareTypeEnum.CURRENT.getCode(), dateRange.getTag())).findFirst().orElse(null);
+        BaseLargeScreenQueryParamDto queryParamDto = new BaseLargeScreenQueryParamDto();
+        queryParamDto.setStartDate(currentDateRangeDto.getStartDate());
+        queryParamDto.setEndDate(currentDateRangeDto.getEndDate());
+        List<SysCheckAnalysisReportCheckProblemCorrectionItemDto> tempCheckProblemCorrectionItemDtoList = checkLargeScreenMapper.problemCorrectionStatistics(queryParamDto);
+        if (CollUtil.isEmpty(tempCheckProblemCorrectionItemDtoList)) {
+            return null;
+        }
+        Map<Long, SysCheckAnalysisReportCheckProblemCorrectionItemDto> deptMap = tempCheckProblemCorrectionItemDtoList.stream().collect(Collectors.toMap(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getDeptId, item -> item, (oldValue, newValue) -> newValue));
+
+        SysCheckAnalysisReportCheckProblemCorrectionItemDto maxItemDto = tempCheckProblemCorrectionItemDtoList.stream()
+                .filter(p -> p.getOnTimeCompletedCount() != null && p.getOnTimeCompletedCount().compareTo(BigDecimal.ZERO) > 0)
+                .max(Comparator.comparing(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOnTimeCompletedCount))
+                .orElse(null);
+        if (ObjUtil.isNotNull(maxItemDto)) {
+            String desc = maxItemDto.getDeptName() + "的按时整改率更高、整改更及时,是当时整改工作落实较好的科室";
+            checkProblemCorrectionDto.setDesc(desc);
+        }
+
+        List<SysDept> deptList = sysDeptService.selectAllDept(SecurityUtils.getLoginUser().getDeptId());
+        Collections.reverse(deptList);
+        SysDept station = deptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(null);
+        SysDept deptQuery = new SysDept();
+        deptQuery.setParentId(station.getDeptId());
+        deptQuery.setDeptType(DeptType.DEPARTMENT.getCode());
+        List<SysDept> sysDeptList = sysDeptService.selectDeptInfoAll(deptQuery);
+        sysDeptList.forEach(dept -> {
+            SysCheckAnalysisReportCheckProblemCorrectionItemDto itemDto = deptMap.get(dept.getDeptId());
+            if (itemDto != null) {
+                checkProblemCorrectionItemDtoList.add(itemDto);
+            } else {
+                SysCheckAnalysisReportCheckProblemCorrectionItemDto itemDtoZero = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
+                itemDtoZero.setDeptId(dept.getDeptId());
+                itemDtoZero.setDeptName(dept.getDeptName());
+                itemDtoZero.setOnTimeCompletedCount(BigDecimal.ZERO);
+                itemDtoZero.setOverTimeCompletedCount(BigDecimal.ZERO);
+                itemDtoZero.setOnTimeUnfinishedCount(BigDecimal.ZERO);
+                itemDtoZero.setOverTimeUnfinishedCount(BigDecimal.ZERO);
+                itemDtoZero.setOtherCount(BigDecimal.ZERO);
+                checkProblemCorrectionItemDtoList.add(itemDtoZero);
+            }
+        });
+
+        SysCheckAnalysisReportCheckProblemCorrectionItemDto totalItem = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
+        totalItem.setDeptId(null);
+        totalItem.setDeptName("总数");
+        totalItem.setOnTimeCompletedCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOnTimeCompletedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+        totalItem.setOverTimeCompletedCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOverTimeCompletedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+        totalItem.setOnTimeUnfinishedCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOnTimeUnfinishedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+        totalItem.setOverTimeUnfinishedCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOverTimeUnfinishedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+        totalItem.setOtherCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOtherCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+        checkProblemCorrectionItemDtoList.add(0, totalItem);
+        checkProblemCorrectionDto.setCheckProblemCorrectionItemDtoList(checkProblemCorrectionItemDtoList);
+
+        return checkProblemCorrectionDto;
+    }
+
+    /**
+     * 质控分析报告-质控活动-问题分布统计
+     *
+     * @param paramDto 查询参数
+     * @return 质控分析报告-质控活动-问题分布统计
+     */
+    @Override
+    public SysCheckAnalysisReportCheckProblemDistributionDto getCheckProblemDistribution(BaseLargeScreenQueryParamDto paramDto) {
+        SysCheckAnalysisReportCheckProblemDistributionDto checkProblemDistributionDto = new SysCheckAnalysisReportCheckProblemDistributionDto();
+        List<SysCheckAnalysisReportCheckProblemDistributionItemDto> checkProblemDistributionItemDtoList = checkLargeScreenMapper.problemDistributionStatistics(paramDto);
+        checkProblemDistributionDto.setCheckProblemDistributionItemDtoList(checkProblemDistributionItemDtoList);
+        if (CollUtil.isEmpty(checkProblemDistributionItemDtoList)) {
+            return null;
+        }
+
+        StringBuilder desc = new StringBuilder();
+        String formatOne = "%s类型问题占比最大";
+        desc.append(String.format(formatOne, checkProblemDistributionItemDtoList.get(0).getName()));
+        checkProblemDistributionDto.setDesc(desc.length() == 0 ? null : desc.toString());
+
+        return checkProblemDistributionDto;
+    }
+
 }

airport-check/src/main/resources/mapper/check/CheckLargeScreenMapper.xml

@@ -891,4 +891,61 @@
         </if>
     </select>
 
+    <select id="problemDistributionTotal" resultType="java.math.BigDecimal">
+        select count(cpi.id) total
+        from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        where 1 = 1
+        <if test="startDate != null and endDate != null">
+            and (cc.check_time >= #{startDate}
+            and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+        </if>
+    </select>
+
+    <select id="problemDistributionStatistics"
+            resultType="com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDistributionItemDto">
+        select cpi.category_code_one code,
+        cpi.category_name_one name,
+        count(cpi.id) total
+        from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        where 1 = 1
+        <if test="startDate != null and endDate != null">
+            and (cc.check_time >= #{startDate}
+            and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+        </if>
+        group by cpi.category_code_one, cpi.category_name_one
+        order by total desc
+    </select>
+
+    <select id="problemCorrectionStatistics"
+            resultType="com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemCorrectionItemDto">
+        select temp.deptId deptId,
+        temp.deptName deptName,
+        ifnull(sum(case when temp.type = 'ON_TIME_COMPLETED' then 1 else 0 end), 0) onTimeCompletedCount,
+        ifnull(sum(case when temp.type = 'OVER_TIME_COMPLETED' then 1 else 0 end), 0) overTimeCompletedCount,
+        ifnull(sum(case when temp.type = 'ON_TIME_UNFINISHED' then 1 else 0 end), 0) onTimeUnfinishedCount,
+        ifnull(sum(case when temp.type = 'OVER_TIME_UNFINISHED' then 1 else 0 end), 0) overTimeUnfinishedCount,
+        ifnull(sum(case when temp.type = 'OTHER' then 1 else 0 end), 0) otherCount
+        from (select cc.checked_brigade_id deptId,
+        cc.checked_brigade_name deptName,
+        case
+        when cc.status = 'RECTIFIED' and cc.rectification_deadline >= cc.completion_time
+        then 'ON_TIME_COMPLETED'
+        when cc.status = 'RECTIFIED' and cc.rectification_deadline <![CDATA[ < ]]> cc.completion_time
+        then 'OVER_TIME_COMPLETED'
+        when cc.status = 'UNDER_RECTIFICATION' and CURRENT_DATE() <![CDATA[ <= ]]> cc.rectification_deadline
+        then 'ON_TIME_UNFINISHED'
+        when cc.status = 'UNDER_RECTIFICATION' and CURRENT_DATE() > cc.rectification_deadline
+        then 'OVER_TIME_UNFINISHED'
+        else 'OTHER' end type
+        from check_correction cc
+        where 1 = 1
+        <if test="startDate != null and endDate != null">
+            and (cc.check_time >= #{startDate}
+            and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+        </if>) temp
+        group by temp.deptId, temp.deptName
+    </select>
+
 </mapper>

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysAnalysisReportCompareItemDto.java

@@ -0,0 +1,46 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 质控分析报告-同比/环比
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysAnalysisReportCompareItemDto {
+
+    /**
+     * YEAR_ON_YEAR=同比;RING_RATIO=环比
+     */
+    private String compareType;
+
+    /**
+     * 同比/环比
+     */
+    private String compareTypeDesc;
+
+    /**
+     * RISE=上升;DECLINE=下降;FLAT=持平
+     */
+    private String compareResultType;
+
+    /**
+     * 上升/下降/持平
+     */
+    private String compareResultTypeDesc;
+
+    /**
+     * 比例
+     */
+    private BigDecimal proportion;
+
+    /**
+     * 比例描述
+     */
+    private String proportionDesc;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysAnalysisReportDateRangeDto.java

@@ -0,0 +1,44 @@
+package com.sundot.airport.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 质控分析报告-时间段
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysAnalysisReportDateRangeDto {
+
+    /**
+     * 开始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /**
+     * 时间段描述
+     */
+    private String desc;
+
+    /**
+     * 时间段标识:时间段标识:CURRENT=当期,YEAR_ON_YEAR=同比,RING_RATIO=环比
+     */
+    private String tag;
+
+    /**
+     * 时间段标识名称
+     */
+    private String tagDesc;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysAnalysisReportParamDto.java

@@ -0,0 +1,41 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 质控分析报告-质控活动接口入参
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysAnalysisReportParamDto {
+
+    /**
+     * 时间范围类型:YEAR=年份;QUARTER=季度;MONTH=月份
+     */
+    private String dateRangeQueryType;
+
+    /**
+     * 年份
+     */
+    private Integer year;
+
+    /**
+     * 季度
+     */
+    private Integer quarter;
+
+    /**
+     * 月份
+     */
+    private Integer month;
+
+    /**
+     * 时间段列表
+     */
+    private List<SysAnalysisReportDateRangeDto> dateRangeList;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportCheckProblemCorrectionDto.java

@@ -0,0 +1,26 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 问题整改统计
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysCheckAnalysisReportCheckProblemCorrectionDto {
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 问题整改统计明细列表
+     */
+    private List<SysCheckAnalysisReportCheckProblemCorrectionItemDto> checkProblemCorrectionItemDtoList;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportCheckProblemCorrectionItemDto.java

@@ -0,0 +1,51 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 问题整改统计明细
+ *
+ * @author ruoyi
+ * @date 2025-09-07
+ */
+@Data
+public class SysCheckAnalysisReportCheckProblemCorrectionItemDto {
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 按期已完成数量
+     */
+    private BigDecimal onTimeCompletedCount;
+
+    /**
+     * 超期已完成数量
+     */
+    private BigDecimal overTimeCompletedCount;
+
+    /**
+     * 按期整改中数量
+     */
+    private BigDecimal onTimeUnfinishedCount;
+
+    /**
+     * 超期整改中数量
+     */
+    private BigDecimal overTimeUnfinishedCount;
+
+    /**
+     * 其他数量
+     */
+    private BigDecimal otherCount;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportCheckProblemDiscoveryDto.java

@@ -0,0 +1,37 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 问题发现统计
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysCheckAnalysisReportCheckProblemDiscoveryDto {
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 数量
+     */
+    private BigDecimal count;
+
+    /**
+     * 同比/环比
+     */
+    private List<SysAnalysisReportCompareItemDto> compareItemDtoList;
+
+    /**
+     * 问题发现统计明细列表
+     */
+    private List<SysCheckAnalysisReportCheckProblemDiscoveryItemDto> checkProblemDiscoveryItemDtoList;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportCheckProblemDiscoveryItemDto.java

@@ -0,0 +1,50 @@
+package com.sundot.airport.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 问题发现统计明细
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysCheckAnalysisReportCheckProblemDiscoveryItemDto {
+
+    /**
+     * 开始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /**
+     * 时间段描述
+     */
+    private String desc;
+
+    /**
+     * 时间段标识:CURRENT=当期,YEAR_ON_YEAR=同比,RING_RATIO=环比
+     */
+    private String tag;
+
+    /**
+     * 时间段标识名称
+     */
+    private String tagDesc;
+
+    /**
+     * 数量
+     */
+    private BigDecimal count;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportCheckProblemDistributionDto.java

@@ -0,0 +1,26 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 问题分布统计
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysCheckAnalysisReportCheckProblemDistributionDto {
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 问题分布统计明细列表
+     */
+    private List<SysCheckAnalysisReportCheckProblemDistributionItemDto> checkProblemDistributionItemDtoList;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportCheckProblemDistributionItemDto.java

@@ -0,0 +1,31 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 问题分布统计明细
+ *
+ * @author ruoyi
+ * @date 2025-09-07
+ */
+@Data
+public class SysCheckAnalysisReportCheckProblemDistributionItemDto {
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 总数
+     */
+    private BigDecimal total;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportCheckTaskDto.java

@@ -0,0 +1,31 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 任务计划安排统计
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysCheckAnalysisReportCheckTaskDto {
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 专项任务/日常任务
+     */
+    private List<SysCheckAnalysisReportCheckTaskTypeItemDto> checkTaskTypeItemDtoList;
+
+    /**
+     * 任务计划安排统计明细列表
+     */
+    private List<SysCheckAnalysisReportCheckTaskItemDto> checkTaskItemDtoList;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportCheckTaskItemDto.java

@@ -0,0 +1,60 @@
+package com.sundot.airport.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 任务计划安排统计明细
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysCheckAnalysisReportCheckTaskItemDto {
+
+    /**
+     * 开始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /**
+     * 时间段描述
+     */
+    private String desc;
+
+    /**
+     * 时间段标识:时间段标识:CURRENT=当期,YEAR_ON_YEAR=同比,RING_RATIO=环比
+     */
+    private String tag;
+
+    /**
+     * 时间段标识名称
+     */
+    private String tagDesc;
+
+    /**
+     * SPECIAL_TASK=专项任务;DAILY_TASK=日常任务
+     */
+    private String type;
+
+    /**
+     * 专项任务/日常任务
+     */
+    private String typeDesc;
+
+    /**
+     * 数量
+     */
+    private BigDecimal count;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportCheckTaskTypeItemDto.java

@@ -0,0 +1,37 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 任务计划安排统计-专项任务/日常任务
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysCheckAnalysisReportCheckTaskTypeItemDto {
+
+    /**
+     * SPECIAL_TASK=专项任务;DAILY_TASK=日常任务
+     */
+    private String type;
+
+    /**
+     * 专项任务/日常任务
+     */
+    private String typeDesc;
+
+    /**
+     * 数量
+     */
+    private BigDecimal count;
+
+    /**
+     * 同比/环比
+     */
+    private List<SysAnalysisReportCompareItemDto> compareItemDtoList;
+
+}

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysCheckAnalysisReportDto.java

@@ -0,0 +1,34 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+/**
+ * 质控活动
+ *
+ * @author ruoyi
+ * @date 2025-01-06
+ */
+@Data
+public class SysCheckAnalysisReportDto {
+
+    /**
+     * 任务计划安排统计
+     */
+    private SysCheckAnalysisReportCheckTaskDto checkTaskDto;
+
+    /**
+     * 问题发现统计
+     */
+    private SysCheckAnalysisReportCheckProblemDiscoveryDto checkProblemDiscoveryDto;
+
+    /**
+     * 问题分布统计
+     */
+    private SysCheckAnalysisReportCheckProblemDistributionDto checkProblemDistributionDto;
+
+    /**
+     * 问题整改统计
+     */
+    private SysCheckAnalysisReportCheckProblemCorrectionDto checkProblemCorrectionDto;
+
+}

airport-common/src/main/java/com/sundot/airport/common/enums/CheckTaskTypeEnum.java

@@ -0,0 +1,27 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 任务类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum CheckTaskTypeEnum {
+    SPECIAL_TASK("SPECIAL_TASK", "专项任务"),
+    DAILY_TASK("DAILY_TASK", "日常任务");
+
+    private final String code;
+    private final String desc;
+
+    public static CheckTaskTypeEnum getByCode(String code) {
+        for (CheckTaskTypeEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

airport-common/src/main/java/com/sundot/airport/common/enums/CompareResultTypeEnum.java

@@ -0,0 +1,28 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 质控分析报告比较枚举
+ **/
+@Getter
+@AllArgsConstructor
+public enum CompareResultTypeEnum {
+    RISE("RISE", "上升"),
+    DECLINE("DECLINE", "下降"),
+    FLAT("FLAT", "持平");
+
+    private final String code;
+    private final String desc;
+
+    public static CompareResultTypeEnum getByCode(String code) {
+        for (CompareResultTypeEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

airport-common/src/main/java/com/sundot/airport/common/enums/CompareTypeEnum.java

@@ -0,0 +1,28 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 质控分析报告比较枚举
+ **/
+@Getter
+@AllArgsConstructor
+public enum CompareTypeEnum {
+    YEAR_ON_YEAR("YEAR_ON_YEAR", "同比"),
+    RING_RATIO("RING_RATIO", "环比"),
+    CURRENT("CURRENT", "当期");
+
+    private final String code;
+    private final String desc;
+
+    public static CompareTypeEnum getByCode(String code) {
+        for (CompareTypeEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

airport-common/src/main/java/com/sundot/airport/common/enums/DateRangeQueryTypeEnum.java

@@ -0,0 +1,28 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 质控分析报告时间范围类型枚举
+ **/
+@Getter
+@AllArgsConstructor
+public enum DateRangeQueryTypeEnum {
+    YEAR("YEAR", "年份"),
+    QUARTER("QUARTER", "季度"),
+    MONTH("MONTH", "月份");
+
+    private final String code;
+    private final String desc;
+
+    public static DateRangeQueryTypeEnum getByCode(String code) {
+        for (DateRangeQueryTypeEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

airport-common/src/main/java/com/sundot/airport/common/utils/DateRangeQueryUtils.java

@@ -0,0 +1,203 @@
+package com.sundot.airport.common.utils;
+
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.common.core.domain.SysAnalysisReportDateRangeDto;
+import com.sundot.airport.common.enums.CompareTypeEnum;
+import com.sundot.airport.common.exception.ServiceException;
+
+import java.time.LocalDate;
+import java.time.Year;
+
+/**
+ * 日期范围查询工具类（支持年份、月份、季度指定）
+ * 适用于 SysAnalysisReportDateRangeDto 对象生成
+ */
+public class DateRangeQueryUtils {
+
+    // ==================== 根据年份和月份查询 ====================
+
+    /**
+     * 根据指定年份和月份获取该月的起止日期
+     */
+    public static SysAnalysisReportDateRangeDto getMonthRange(int year, int month, String tag) {
+        LocalDate startDate = LocalDate.of(year, month, 1);
+        LocalDate endDate = startDate.withDayOfMonth(startDate.lengthOfMonth());
+        String desc = year + "年" + month + "月";
+        if (StrUtil.isEmpty(tag)) {
+            tag = CompareTypeEnum.CURRENT.getCode();
+        }
+        return buildDto(startDate, endDate, desc, tag);
+    }
+
+    /**
+     * 根据指定年份和月份获取上个月的起止日期
+     */
+    public static SysAnalysisReportDateRangeDto getPreviousMonthRange(int year, int month) {
+        LocalDate specifiedDate = LocalDate.of(year, month, 1);
+        LocalDate lastMonth = specifiedDate.minusMonths(1);
+        String tag = CompareTypeEnum.RING_RATIO.getCode();
+        return getMonthRange(lastMonth.getYear(), lastMonth.getMonthValue(), tag);
+    }
+
+    /**
+     * 根据指定年份和月份获取去年同月的起止日期
+     */
+    public static SysAnalysisReportDateRangeDto getLastYearSameMonthRange(int year, int month) {
+        String tag = CompareTypeEnum.YEAR_ON_YEAR.getCode();
+        return getMonthRange(year - 1, month, tag);
+    }
+
+    // ==================== 根据年份和季度查询 ====================
+
+    /**
+     * 根据指定年份和季度获取该季度的起止日期
+     * 季度划分：Q1(1-3月), Q2(4-6月), Q3(7-9月), Q4(10-12月)
+     */
+    public static SysAnalysisReportDateRangeDto getQuarterRange(int year, int quarter, String tag) {
+        LocalDate startDate, endDate;
+
+        switch (quarter) {
+            case 1:
+                startDate = LocalDate.of(year, 1, 1);
+                endDate = LocalDate.of(year, 3, 31);
+                break;
+            case 2:
+                startDate = LocalDate.of(year, 4, 1);
+                endDate = LocalDate.of(year, 6, 30);
+                break;
+            case 3:
+                startDate = LocalDate.of(year, 7, 1);
+                endDate = LocalDate.of(year, 9, 30);
+                break;
+            case 4:
+                startDate = LocalDate.of(year, 10, 1);
+                endDate = LocalDate.of(year, 12, 31);
+                break;
+            default:
+                throw new ServiceException("无效的季度: " + quarter + "，季度范围应为1-4");
+        }
+
+        String desc = year + "年第" + quarter + "季度";
+        if (StrUtil.isEmpty(tag)) {
+            tag = CompareTypeEnum.CURRENT.getCode();
+        }
+        return buildDto(startDate, endDate, desc, tag);
+    }
+
+    /**
+     * 根据指定年份和季度获取上一个季度的起止日期
+     */
+    public static SysAnalysisReportDateRangeDto getPreviousQuarterRange(int year, int quarter) {
+        int previousQuarter = quarter - 1;
+        int targetYear = year;
+
+        if (previousQuarter == 0) {
+            previousQuarter = 4;
+            targetYear = year - 1;
+        }
+
+        String tag = CompareTypeEnum.RING_RATIO.getCode();
+        return getQuarterRange(targetYear, previousQuarter, tag);
+    }
+
+    /**
+     * 根据指定年份和季度获取去年同季度的起止日期
+     */
+    public static SysAnalysisReportDateRangeDto getLastYearSameQuarterRange(int year, int quarter) {
+        String tag = CompareTypeEnum.YEAR_ON_YEAR.getCode();
+        return getQuarterRange(year - 1, quarter, tag);
+    }
+
+    // ==================== 根据年份查询 ====================
+
+    /**
+     * 根据指定年份获取该年度的起止日期
+     */
+    public static SysAnalysisReportDateRangeDto getYearRange(int year, String tag) {
+        LocalDate startDate = LocalDate.of(year, 1, 1);
+        LocalDate endDate = LocalDate.of(year, 12, 31);
+        String desc = year + "年";
+
+        if (StrUtil.isEmpty(tag)) {
+            tag = CompareTypeEnum.CURRENT.getCode();
+        }
+        return buildDto(startDate, endDate, desc, tag);
+    }
+
+    /**
+     * 根据指定年份获取上一年度的起止日期
+     */
+    public static SysAnalysisReportDateRangeDto getPreviousYearRange(int year) {
+        String tag = CompareTypeEnum.YEAR_ON_YEAR.getCode();
+        return getYearRange(year - 1, tag);
+    }
+
+    // ==================== 便捷方法（基于当前日期）====================
+
+    /**
+     * 获取当前月份范围（基于当前日期）
+     */
+    public static SysAnalysisReportDateRangeDto getCurrentMonthRange() {
+        LocalDate today = LocalDate.now();
+        String tag = CompareTypeEnum.CURRENT.getCode();
+        return getMonthRange(today.getYear(), today.getMonthValue(), tag);
+    }
+
+    /**
+     * 获取当前季度范围（基于当前日期）
+     */
+    public static SysAnalysisReportDateRangeDto getCurrentQuarterRange() {
+        LocalDate today = LocalDate.now();
+        int quarter = (today.getMonthValue() - 1) / 3 + 1;
+        String tag = CompareTypeEnum.CURRENT.getCode();
+        return getQuarterRange(today.getYear(), quarter, tag);
+    }
+
+    /**
+     * 获取当前年度范围（基于当前日期）
+     */
+    public static SysAnalysisReportDateRangeDto getCurrentYearRange() {
+        String tag = CompareTypeEnum.CURRENT.getCode();
+        return getYearRange(Year.now().getValue(), tag);
+    }
+
+    // ==================== 辅助方法 ====================
+
+    /**
+     * 构建 SysAnalysisReportDateRangeDto 对象
+     */
+    private static SysAnalysisReportDateRangeDto buildDto(LocalDate start, LocalDate end, String desc, String tag) {
+        SysAnalysisReportDateRangeDto dto = new SysAnalysisReportDateRangeDto();
+        dto.setStartDate(java.sql.Date.valueOf(start));
+        dto.setEndDate(java.sql.Date.valueOf(end));
+        dto.setDesc(desc);
+        dto.setTag(tag);
+        dto.setTagDesc(CompareTypeEnum.getByCode(tag).getDesc());
+        return dto;
+    }
+
+    /**
+     * 根据月份获取对应的季度
+     */
+    public static int getQuarterByMonth(int month) {
+        if (month < 1 || month > 12) {
+            throw new IllegalArgumentException("月份必须在1-12之间");
+        }
+        return (month - 1) / 3 + 1;
+    }
+
+    /**
+     * 验证季度是否有效
+     */
+    public static boolean isValidQuarter(int quarter) {
+        return quarter >= 1 && quarter <= 4;
+    }
+
+    /**
+     * 验证月份是否有效
+     */
+    public static boolean isValidMonth(int month) {
+        return month >= 1 && month <= 12;
+    }
+
+}