From b99770bc75060c632b81a4e7738347b978dd3868 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 02 七月 2024 18:08:13 +0800 Subject: [PATCH] 考试清空答案解析 --- src/main/java/com/mindskip/xzs/repository/QuestionMapper.java | 1 + src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java | 13 +++++++++---- src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java | 6 ++++++ src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java | 2 ++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java index 37f60df..5f472af 100644 --- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java +++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java @@ -15,10 +15,7 @@ import com.mindskip.xzs.utility.DateTimeUtil; import com.mindskip.xzs.utility.PageInfoHelper; import com.mindskip.xzs.utility.excel.ExcelUtils; -import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM; -import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVO; -import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM; -import com.mindskip.xzs.viewmodel.admin.exam.ExamResponseVM; +import com.mindskip.xzs.viewmodel.admin.exam.*; import lombok.SneakyThrows; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -123,6 +120,14 @@ @RequestMapping(value = "/select/{id}", method = RequestMethod.POST) public RestResponse<ExamPaperEditRequestVO> select(@PathVariable Integer id) { ExamPaperEditRequestVO vm = examPaperService.examPaperToVM(id); + for (ExamPaperTitleItemVO titleItem : vm.getTitleItems()) { + titleItem.getQuestionItems().stream().forEach(question -> { + // 娓呯┖绛旀銆佽В鏋� + question.setCorrect(""); + question.setAnalyze(""); + question.setCorrectArray(null); + }); + } return RestResponse.ok(vm); } diff --git a/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java b/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java index 7dd6d8f..fd52320 100644 --- a/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java +++ b/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java @@ -46,6 +46,12 @@ } + /** + * 寮�濮嬭�冭瘯 + * + * @param id + * @return + */ @RequestMapping(value = "/select/{id}", method = RequestMethod.POST) public RestResponse<ExamPaperEditRequestVO> select(@PathVariable Integer id) { return RestResponse.ok(examPaperService.examPaperToVM(id)); diff --git a/src/main/java/com/mindskip/xzs/repository/QuestionMapper.java b/src/main/java/com/mindskip/xzs/repository/QuestionMapper.java index a839f5a..4dfc6e4 100644 --- a/src/main/java/com/mindskip/xzs/repository/QuestionMapper.java +++ b/src/main/java/com/mindskip/xzs/repository/QuestionMapper.java @@ -22,6 +22,7 @@ List<Question> page(QuestionPageRequestVM requestVM); List<Question> selectByIds(@Param("ids") List<Integer> ids); + List<QuestionVO> getVoByIds(@Param("ids") List<Integer> ids); Integer selectAllCount(); diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java index 3dec741..3417e8c 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java @@ -171,6 +171,7 @@ throw new RuntimeException("璇ヨ瘯鍗锋病鏈夐鐩�"); } List<Question> questions = questionMapper.selectByIds(questionIds); + //鍗曢�夋暟閲� Integer singleChoice = questions.stream().filter(e -> e.getQuestionType() == 1).collect(Collectors.toList()).size(); //澶氶�夋暟閲� @@ -186,6 +187,7 @@ List<ExamQuestionVO> questionItemsVM = t.getQuestionItems().stream().map(i -> { Question question = questions.stream().filter(q -> q.getId().equals(i.getId())).findFirst().get(); ExamQuestionVO questionEditRequestVM = questionService.getQuestionEditRequestVM(question); + questionEditRequestVM.setTitle("(" + QuestionTypeEnum.fromCode(questionEditRequestVM.getQuestionType()).getName() + ") " + questionEditRequestVM.getTitle()); questionEditRequestVM.setItemOrder(generateRandomNumber(questionEditRequestVM.getQuestionType() == 1 ? 0 : ((questionEditRequestVM.getQuestionType() == 2 ? singleChoice : multipleChoice + singleChoice)), questionEditRequestVM.getQuestionType() == 1 ? singleChoice : ((questionEditRequestVM.getQuestionType() == 2 ? multipleChoice + singleChoice : trueFalse + multipleChoice + singleChoice)), -- Gitblit v1.8.0