diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java index eaec92b..3241e16 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java @@ -1456,8 +1456,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { // 6. 处理每月数据,传入主观评价统计结果 - return processMonthlyData( - records,res, rightCount, wrongCount, + return processMonthlyData(records,res,rightCount,wrongCount, targetStudents, monthlyResults, knowledgeBlockMap, @@ -1632,18 +1631,17 @@ public class MoralEducationServiceImpl implements MoralEducationService { detail.put("resCount", res.size()); details.add(detail); detailList.put("detail",details); - List> collect = months.stream().map(month -> { Map monthEntry = new LinkedHashMap<>(); monthEntry.put("month", month); List> scoreList = new ArrayList<>(); // 按学生分组考试结果 - Map> studentResults = monthlyResults + Map> studentResults = monthlyResults .getOrDefault(month, Collections.emptyList()) .stream() .filter(wrapper -> targetStudentIds.contains(wrapper.getStudentId())) - .collect(Collectors.groupingBy(ExamResultWrapper::getStudentId)); + .collect(Collectors.groupingBy(MoralEducationServiceImpl.ExamResultWrapper::getStudentId)); // 初始化知识块总分计数器 Map blockTotalScores = new HashMap<>(); @@ -1651,9 +1649,9 @@ public class MoralEducationServiceImpl implements MoralEducationService { // 遍历所有目标学生 targetStudentIds.forEach(studentId -> { - List wrappers = studentResults.getOrDefault(studentId, Collections.emptyList()); + List wrappers = studentResults.getOrDefault(studentId, Collections.emptyList()); List examResults = wrappers.stream() - .map(ExamResultWrapper::getResult) + .map(MoralEducationServiceImpl.ExamResultWrapper::getResult) .collect(Collectors.toList()); // 1. 计算知识点得分(保留原始逻辑) @@ -1661,11 +1659,11 @@ public class MoralEducationServiceImpl implements MoralEducationService { studentId, examResults, wrappers.stream().collect(Collectors.toMap( - ExamResultWrapper::getExamId, - ExamResultWrapper::getKnowledge)), + MoralEducationServiceImpl.ExamResultWrapper::getExamId, + MoralEducationServiceImpl.ExamResultWrapper::getKnowledge)), wrappers.stream().collect(Collectors.toMap( - ExamResultWrapper::getExamId, - ExamResultWrapper::getPoints)) + MoralEducationServiceImpl.ExamResultWrapper::getExamId, + MoralEducationServiceImpl.ExamResultWrapper::getPoints)) ); // 2. 计算每个知识块的客观得分(新增关键逻辑)