From 59713f903d06cd1784d20957be62c88502d24cb5 Mon Sep 17 00:00:00 2001 From: "MSI\\letre" Date: Thu, 10 Jul 2025 00:09:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E7=AB=AF=E6=9F=A5=E8=AF=A2=E8=AF=95=E9=A2=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=AC=AC=E4=BA=8C=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/autoTools/AutoToolsController.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java index 6f4bb393..884f534f 100644 --- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java +++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java @@ -31,6 +31,10 @@ import pc.exam.pp.module.judgement.service.wps_word.JudgementWpsWordService; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; /** * @author REN @@ -64,11 +68,17 @@ public class AutoToolsController { stuPaperScoreInfoVos.setStuPaperScoreDOList(stuPaperScoreService.findByStuIDAndPaperId(stuPaperReqVo.getStuId(),stuPaperReqVo.getPaperId())); // 4、查询学生试卷内容信息 List quIds = educationPaperQuMapper.selectPaperQuByPaperId(stuPaperReqVo.getPaperId()); - List examQuestionList = new ArrayList<>(); + List examQuestionList = examQuestionMapper.selectExamQuestionListByQuIds(quIds); + Map questionMap = examQuestionList.stream() + .collect(Collectors.toMap(ExamQuestion::getQuId, Function.identity())); + examQuestionList = quIds.stream() + .map(questionMap::get) + .filter(Objects::nonNull) + .collect(Collectors.toList()); // 一条一条进行查询试题，防止顺序错乱 - for (String quId : quIds) { - examQuestionList.add(examQuestionMapper.selectExamQuestionByQuId(quId)); - } +// for (String quId : quIds) { +// examQuestionList.add(examQuestionMapper.selectExamQuestionByQuId(quId)); +// } stuPaperScoreInfoVos.setExamQuestionList(examQuestionList); // 5、查询学生试卷分析 List scoreDOS = stuPaperScoreService.findByStuIDAndPaperId(stuPaperReqVo.getStuId(),stuPaperReqVo.getPaperId());