From 489eebe584a8d991f844ff4c703779c7b5d0af5e Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 13 五月 2024 13:58:06 +0800
Subject: [PATCH] feat：在线看题
---
src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
index 98e5ac6..ff336aa 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
@@ -14,10 +14,7 @@
import com.mindskip.xzs.service.QuestionSubjectService;
import com.mindskip.xzs.service.SubjectService;
import com.mindskip.xzs.service.TextContentService;
-import com.mindskip.xzs.utility.DateTimeUtil;
-import com.mindskip.xzs.utility.JsonUtil;
-import com.mindskip.xzs.utility.ModelMapperSingle;
-import com.mindskip.xzs.utility.ExamUtil;
+import com.mindskip.xzs.utility.*;
import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM;
import com.mindskip.xzs.viewmodel.admin.question.ExamQuestionVO;
import com.mindskip.xzs.viewmodel.admin.question.QuestionEditItemVM;
@@ -25,6 +22,10 @@
import com.mindskip.xzs.viewmodel.admin.question.QuestionPageRequestVM;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.mindskip.xzs.viewmodel.student.question.answer.QuestionPageStudentRequestVM;
+import com.mindskip.xzs.viewmodel.student.question.answer.QuestionPageStudentResponseVM;
+import com.mindskip.xzs.vo.QuestionExportVO;
+import com.mindskip.xzs.vo.QuestionImportVO;
import org.modelmapper.ModelMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -156,27 +157,27 @@
questionEditRequestVM.setTitle(questionObject.getTitleContent());
//绛旀
-// QuestionTypeEnum questionTypeEnum = QuestionTypeEnum.fromCode(question.getQuestionType());
-// switch (questionTypeEnum) {
-// case SingleChoice:
-// case TrueFalse:
-// questionEditRequestVM.setCorrect(question.getCorrect());
-// break;
-// case MultipleChoice:
-// questionEditRequestVM.setCorrectArray(ExamUtil.contentToArray(question.getCorrect()));
-// break;
-// case GapFilling:
-// List<String> correctContent = questionObject.getQuestionItemObjects().stream().map(d -> d.getContent()).collect(Collectors.toList());
-// questionEditRequestVM.setCorrectArray(correctContent);
-// break;
-// case ShortAnswer:
-// questionEditRequestVM.setCorrect(questionObject.getCorrect());
-// break;
-// default:
-// break;
-// }
-// questionEditRequestVM.setScore(ExamUtil.scoreToVM(question.getScore()));
-// questionEditRequestVM.setAnalyze(questionObject.getAnalyze());
+ QuestionTypeEnum questionTypeEnum = QuestionTypeEnum.fromCode(question.getQuestionType());
+ switch (questionTypeEnum) {
+ case SingleChoice:
+ case TrueFalse:
+ questionEditRequestVM.setCorrect(question.getCorrect());
+ break;
+ case MultipleChoice:
+ questionEditRequestVM.setCorrectArray(ExamUtil.contentToArray(question.getCorrect()));
+ break;
+ case GapFilling:
+ List<String> correctContent = questionObject.getQuestionItemObjects().stream().map(d -> d.getContent()).collect(Collectors.toList());
+ questionEditRequestVM.setCorrectArray(correctContent);
+ break;
+ case ShortAnswer:
+ questionEditRequestVM.setCorrect(questionObject.getCorrect());
+ break;
+ default:
+ break;
+ }
+ questionEditRequestVM.setScore(ExamUtil.scoreToVM(question.getScore()));
+ questionEditRequestVM.setAnalyze(questionObject.getAnalyze());
//棰樼洰椤规槧灏�
@@ -251,4 +252,17 @@
}
+ @Override
+ public List<QuestionImportVO> export(QuestionExportVO query) {
+ return questionMapper.export(query);
+ }
+
+ @Override
+ public PageInfo<QuestionPageStudentResponseVM> selectQuestion(QuestionPageStudentRequestVM model) {
+ return PageHelper.startPage(model.getPageIndex(), model.getPageSize(), "id desc").doSelectPageInfo(() ->
+ questionMapper.selectQuestion(model).stream().peek(
+ q -> q.setShortTitle(HtmlUtil.clear(q.getShortTitle()))
+ ).collect(Collectors.toList())
+ );
+ }
}
--
Gitblit v1.8.0