绩效分析报告页面接口优化改造

airport-admin/src/main/java/com/sundot/airport/web/controller/item/PerformanceDimensionController.java

@@ -509,8 +509,9 @@ public class PerformanceDimensionController {
             List<TimeBasedPerformanceResult.DataItem> dataItems = new ArrayList<>();
 
             // 为每个科室计算该时间段的数据
+            Map<Long, String> nameMap = getDeptNameMap(new ArrayList<>(deptIds));
             for (Long deptId : deptIds) {
-                String deptName = getGroupName(deptId);
+                String deptName = nameMap.get(deptId);
                 if (deptName == null) continue;
 
                 BigDecimal value = getDimensionValueFromPreloadedData(
@@ -589,8 +590,9 @@ public class PerformanceDimensionController {
             List<TimeBasedPerformanceResult.DataItem> dataItems = new ArrayList<>();
 
             // 为每个科室计算该时间段的数据
+            Map<Long, String> nameMap = getDeptNameMap(new ArrayList<>(deptIds));
             for (Long deptId : deptIds) {
-                String deptName = getGroupName(deptId);
+                String deptName = nameMap.get(deptId);
                 if (deptName == null) continue;
 
                 BigDecimal value = getDimensionValueFromPreloadedData(
@@ -659,8 +661,14 @@ public class PerformanceDimensionController {
 
 
             // 为每个人员/班组计算该时间段的数据
+            Map<Long, String> nameMap;
+            if (param.getDimension() == 1) {
+                nameMap = getUserNickNameMap(new ArrayList<>(ids));
+            } else {
+                nameMap = getDeptNameMap(new ArrayList<>(ids));
+            }
             for (Long id : ids) {
-                String name = param.getDimension() == 1 ? getUserNickName(id) : getGroupName(id);
+                String name = nameMap.get(id);
                 if (name == null) continue;
 
                 BigDecimal value = getDimensionValueFromPreloadedData(id, map.get(timeKey), param.getResultField());
@@ -1358,11 +1366,12 @@ public class PerformanceDimensionController {
         seizureData.forEach(item -> allUserIds.add(item.getId()));
         inspectionData.forEach(item -> allUserIds.add(item.getId()));
 
+        Map<Long, String> nameMap = getUserNickNameMap(new ArrayList<>(allUserIds));
         for (Long userId : allUserIds) {
             NormalizedData normalized = new NormalizedData();
             normalized.id = userId;
             // 获取用户名
-            String userName = getUserNickName(userId);
+            String userName = nameMap.get(userId);
             normalized.name = userName != null ? userName : "未知用户";
 
             // 获取各项指标原始值
@@ -1432,12 +1441,13 @@ public class PerformanceDimensionController {
         seizureData.forEach(item -> allGroupIds.add(item.getId()));
         inspectionData.forEach(item -> allGroupIds.add(item.getId()));
 
+        Map<Long, String> nameMap = getDeptNameMap(new ArrayList<>(allGroupIds));
         for (Long groupId : allGroupIds) {
             NormalizedData normalized = new NormalizedData();
             normalized.id = groupId;
 
             // 获取组名称
-            String groupName = getGroupName(groupId);
+            String groupName = nameMap.get(groupId);
             normalized.name = groupName != null ? groupName : "未知" + groupType;
 
             // 获取各项指标原始值
@@ -1667,6 +1677,24 @@ public class PerformanceDimensionController {
         return query;
     }
 
+    /**
+     * 获取用户昵称Map
+     */
+    private Map<Long, String> getUserNickNameMap(List<Long> userIdList) {
+        List<SysUser> userList = userMapper.selectByUserIdList(userIdList);
+        Map<Long, String> nameMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName, (existing, replacement) -> existing));
+        return nameMap;
+    }
+
+    /**
+     * 获取部门名称Map
+     */
+    private Map<Long, String> getDeptNameMap(List<Long> deptIdList) {
+        List<SysDept> deptList = sysDeptService.selectDeptByIdList(deptIdList);
+        Map<Long, String> nameMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName, (existing, replacement) -> existing));
+        return nameMap;
+    }
+
 }
 
 

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

@@ -2484,9 +2484,41 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
      */
     private Map<Long, BigDecimal> calculateUsersAccuracyMap(List<Long> userIds, DateRange dateRange) {
         Map<Long, BigDecimal> result = new HashMap<>();
+        // 查询用户在时间范围内已完成的任务
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.in(DailyTask::getDtUserId, userIds);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, java.sql.Date.valueOf(dateRange.startDate));
+        taskWrapper.le(DailyTask::getDtBusinessDate, java.sql.Date.valueOf(dateRange.endDate));
+        taskWrapper.eq(DailyTask::getDtStatus, "COMPLETED");
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+
+        if (tasks.isEmpty()) {
+            for (Long userId : userIds) {
+                result.put(userId, BigDecimal.ZERO);
+            }
+        }
+
+        // 查询所有题目明细
+        List<String> taskIds = tasks.stream().map(DailyTask::getDtId).collect(Collectors.toList());
+        LambdaQueryWrapper<DailyTaskDetail> detailWrapper = new LambdaQueryWrapper<>();
+        detailWrapper.in(DailyTaskDetail::getDtdTaskId, taskIds);
+        detailWrapper.eq(DailyTaskDetail::getDelStatus, 0);
+        detailWrapper.isNotNull(DailyTaskDetail::getDtdIsCorrect);
+        List<DailyTaskDetail> details = dailyTaskDetailMapper.selectList(detailWrapper);
+
         for (Long userId : userIds) {
-            AccuracyData data = calculateUserAccuracy(userId, dateRange);
-            result.put(userId, data.accuracy);
+            List<DailyTask> targetTaskList = tasks.stream().filter(t -> t.getDtUserId().equals(userId)).collect(Collectors.toList());
+            List<String> targetDailyTaskIdList = targetTaskList.stream().map(DailyTask::getDtId).collect(Collectors.toList());
+            List<DailyTaskDetail> targetDetailList = details.stream().filter(d -> targetDailyTaskIdList.contains(d.getDtdTaskId())).collect(Collectors.toList());
+            int totalCount = targetDetailList.size();
+            int correctCount = (int) targetDetailList.stream()
+                    .filter(d -> Boolean.TRUE.equals(d.getDtdIsCorrect()))
+                    .count();
+            BigDecimal accuracy = totalCount > 0
+                    ? new BigDecimal(correctCount).multiply(new BigDecimal(100)).divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP)
+                    : BigDecimal.ZERO;
+            result.put(userId, accuracy);
         }
         return result;
     }