给抽问抽答统计加缓存

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

@@ -358,6 +358,8 @@ public class SysHomeReportController extends BaseController {
         result.setSeizureList(getSeizureList(dtoList));
         // 在岗时长
         result.setWorkingList(getWorkingList(dtoList));
+        // 抽问抽答正确率
+        result.setAnswerList(getAnswerList(dtoList));
         return result;
     }
 
@@ -443,6 +445,32 @@ public class SysHomeReportController extends BaseController {
         return seizureReportService.seizureData(dto);
     }
 
+    /**
+     * 获取首页报表-明细-抽问抽答正确率
+     */
+    private List<SysHomeReportDetailDto> getAnswerList(List<SysHomePageDetailQueryParamDto> dtoList) {
+        List<SysHomeReportDetailDto> result = new ArrayList<>();
+        for (SysHomePageDetailQueryParamDto item : dtoList) {
+            result.add(getAnswer(item));
+        }
+        return result;
+    }
+
+    /**
+     * 获取抽问抽答正确率数据
+     */
+    private SysHomeReportDetailDto getAnswer(SysHomePageDetailQueryParamDto item) {
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            dto.setUserId(item.getId());
+        } else {
+            dto.setDeptId(item.getId());
+        }
+        dto.setSpecifiedDate(item.getSpecifiedDate());
+        dto.setStartDate(item.getStartDate());
+        dto.setEndDate(item.getEndDate());
+        return accuracyStatisticsService.answerData(dto);
+    }
 
     private List<SysHomeReportDetailDto> getWorkingList(List<SysHomePageDetailQueryParamDto> dtoList) {
         List<SysHomeReportDetailDto> result = new ArrayList<>();

airport-exam/src/main/java/com/sundot/airport/exam/service/IAccuracyStatisticsService.java

@@ -61,4 +61,12 @@ public interface IAccuracyStatisticsService {
      * @return 正确率（0-1之间的小数）
      */
     BigDecimal getAccuracyRate(Long userId, Long deptId, java.util.Date startDate, java.util.Date endDate);
+
+    /**
+     * 首页报表-抽问抽答正确率数据
+     *
+     * @param dto 大屏查询参数
+     * @return 首页报表-抽问抽答正确率数据
+     */
+    com.sundot.airport.common.core.domain.SysHomeReportDetailDto answerData(BaseLargeScreenQueryParamDto dto);
 }

airport-exam/src/main/java/com/sundot/airport/exam/service/impl/AccuracyStatisticsServiceImpl.java

@@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
 import com.sundot.airport.common.core.domain.DailyTaskAccuracyRankingDto;
 import com.sundot.airport.common.core.domain.DailyTaskAccuracyRankingItemDto;
+import com.sundot.airport.common.core.domain.SysHomeReportDetailDto;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.HomePageQueryEnum;
+import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.enums.DeptType;
 import com.sundot.airport.common.enums.MedalTypeEnum;
 import com.sundot.airport.common.enums.TimeRangeEnum;
@@ -300,6 +304,134 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
         return BigDecimal.ZERO;
     }
 
+    @Override
+    public SysHomeReportDetailDto answerData(BaseLargeScreenQueryParamDto dto) {
+        if (ObjectUtil.isNull(dto.getUserId()) && ObjectUtil.isNull(dto.getDeptId())) {
+            throw new ServiceException("用户ID和部门ID不能同时为空");
+        }
+        // 默认筛选条件：最近一年
+        if (ObjectUtil.isNull(dto.getStartDate()) && ObjectUtil.isNull(dto.getEndDate()) && ObjectUtil.isNull(dto.getSpecifiedDate())) {
+            Calendar cal = Calendar.getInstance();
+            dto.setEndDate(cal.getTime());
+            cal.add(Calendar.YEAR, -1);
+            dto.setStartDate(cal.getTime());
+        }
+
+        SysHomeReportDetailDto result = new SysHomeReportDetailDto();
+
+        // 设置基本信息
+        if (ObjectUtil.isNotNull(dto.getUserId())) {
+            SysUser sysUser = userService.selectUserById(dto.getUserId());
+            if (ObjectUtil.isNull(sysUser)) {
+                throw new ServiceException("【" + dto.getUserId() + "】用户不存在");
+            }
+            result.setId(sysUser.getUserId());
+            result.setName(sysUser.getNickName());
+            result.setType(HomePageQueryEnum.USER.getCode());
+        } else {
+            SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
+            if (ObjectUtil.isNull(sysDept)) {
+                throw new ServiceException("【" + dto.getDeptId() + "】部门不存在");
+            }
+            result.setId(sysDept.getDeptId());
+            result.setName(sysDept.getDeptName());
+            result.setType(HomePageQueryEnum.DEPT.getCode());
+        }
+
+        // 获取正确率列表
+        List<BigDecimal> accuracyRates = getAccuracyRatesForReport(dto);
+
+        if (accuracyRates.isEmpty()) {
+            result.setMaxNumber(BigDecimal.ZERO);
+            result.setMinNumber(BigDecimal.ZERO);
+            result.setAverageNumber(BigDecimal.ZERO);
+            result.setMedianNumber(BigDecimal.ZERO);
+            return result;
+        }
+
+        // 排序
+        accuracyRates.sort(BigDecimal::compareTo);
+
+        // 最大值（转换为百分比）
+        result.setMaxNumber(accuracyRates.get(accuracyRates.size() - 1).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP));
+        // 最小值（转换为百分比）
+        result.setMinNumber(accuracyRates.get(0).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP));
+        // 平均值
+        BigDecimal sum = accuracyRates.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setAverageNumber(sum.multiply(BigDecimal.valueOf(100)).divide(BigDecimal.valueOf(accuracyRates.size()), 2, RoundingMode.HALF_UP));
+        // 中位数
+        int size = accuracyRates.size();
+        int middle = size / 2;
+        BigDecimal median;
+        if (size % 2 == 1) {
+            median = accuracyRates.get(middle);
+        } else {
+            median = accuracyRates.get(middle - 1).add(accuracyRates.get(middle)).divide(BigDecimal.valueOf(2), 4, RoundingMode.HALF_UP);
+        }
+        result.setMedianNumber(median.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP));
+
+        return result;
+    }
+
+    /**
+     * 获取用于报表统计的正确率列表
+     */
+    private List<BigDecimal> getAccuracyRatesForReport(BaseLargeScreenQueryParamDto dto) {
+        List<BigDecimal> result = new ArrayList<>();
+
+        if (ObjectUtil.isNotNull(dto.getUserId())) {
+            // 用户维度：获取用户在时间范围内每次答题的正确率
+            LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+            taskWrapper.eq(DailyTask::getDtUserId, dto.getUserId());
+            taskWrapper.eq(DailyTask::getDtStatus, DailyTaskStatusEnum.COMPLETED.getCode());
+            taskWrapper.eq(DailyTask::getDelStatus, 0);
+            if (dto.getStartDate() != null) {
+                taskWrapper.ge(DailyTask::getDtBusinessDate, dto.getStartDate());
+            }
+            if (dto.getEndDate() != null) {
+                taskWrapper.le(DailyTask::getDtBusinessDate, dto.getEndDate());
+            }
+            List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+
+            for (DailyTask task : tasks) {
+                LambdaQueryWrapper<DailyTaskDetail> detailWrapper = new LambdaQueryWrapper<>();
+                detailWrapper.eq(DailyTaskDetail::getDtdTaskId, task.getDtId());
+                detailWrapper.eq(DailyTaskDetail::getDelStatus, 0);
+                detailWrapper.isNotNull(DailyTaskDetail::getDtdIsCorrect);
+                List<DailyTaskDetail> details = dailyTaskDetailMapper.selectList(detailWrapper);
+
+                if (!details.isEmpty()) {
+                    long correctCount = details.stream().filter(d -> Boolean.TRUE.equals(d.getDtdIsCorrect())).count();
+                    BigDecimal accuracy = BigDecimal.valueOf(correctCount).divide(BigDecimal.valueOf(details.size()), 4, RoundingMode.HALF_UP);
+                    result.add(accuracy);
+                }
+            }
+        } else if (ObjectUtil.isNotNull(dto.getDeptId())) {
+            // 部门维度：获取部门下所有用户的正确率
+            SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
+            if (sysDept == null) {
+                return result;
+            }
+
+            DeptHierarchy hierarchy = getDeptHierarchy(dto.getDeptId());
+            List<Long> teamIds = getTeamIdsUnderDept(dto.getDeptId(), hierarchy);
+
+            if (teamIds.isEmpty()) {
+                return result;
+            }
+
+            // 获取这些班组下所有用户的正确率
+            List<UserAccuracyInfo> userAccuracies = calculateUserAccuraciesInTeams(teamIds, dto.getStartDate(), dto.getEndDate());
+
+            for (UserAccuracyInfo info : userAccuracies) {
+                // userAccuracies 中的 accuracy 已经是百分比形式，需要转回小数
+                result.add(info.accuracy.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
+            }
+        }
+
+        return result;
+    }
+
     /**
      * 检查是否有待完成任务
      */