From 03f1e635215bdefd1b649a10675278567b5b8800 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 15 三月 2024 11:01:18 +0800
Subject: [PATCH] 试卷不返回答案，空指针修复
---
src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java | 81 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 29 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 00a1780..98e5ac6 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
@@ -9,6 +9,7 @@
import com.mindskip.xzs.domain.question.QuestionItemObject;
import com.mindskip.xzs.domain.question.QuestionObject;
import com.mindskip.xzs.repository.QuestionMapper;
+import com.mindskip.xzs.repository.SubjectMapper;
import com.mindskip.xzs.service.QuestionService;
import com.mindskip.xzs.service.QuestionSubjectService;
import com.mindskip.xzs.service.SubjectService;
@@ -17,6 +18,8 @@
import com.mindskip.xzs.utility.JsonUtil;
import com.mindskip.xzs.utility.ModelMapperSingle;
import com.mindskip.xzs.utility.ExamUtil;
+import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.question.ExamQuestionVO;
import com.mindskip.xzs.viewmodel.admin.question.QuestionEditItemVM;
import com.mindskip.xzs.viewmodel.admin.question.QuestionEditRequestVM;
import com.mindskip.xzs.viewmodel.admin.question.QuestionPageRequestVM;
@@ -40,14 +43,16 @@
private final TextContentService textContentService;
private final SubjectService subjectService;
private final QuestionSubjectService questionSubjectService;
+ private final SubjectMapper subjectMapper;
@Autowired
- public QuestionServiceImpl(QuestionMapper questionMapper, TextContentService textContentService, SubjectService subjectService, QuestionSubjectService questionSubjectService) {
+ public QuestionServiceImpl(QuestionMapper questionMapper, TextContentService textContentService, SubjectService subjectService, QuestionSubjectService questionSubjectService, SubjectMapper subjectMapper) {
super(questionMapper);
this.textContentService = textContentService;
this.questionMapper = questionMapper;
this.subjectService = subjectService;
this.questionSubjectService = questionSubjectService;
+ this.subjectMapper = subjectMapper;
}
@Override
@@ -72,7 +77,7 @@
Question question = new Question();
// question.setSubjectId(model.getSubjectId());
-// question.setGradeLevel(gradeLevel);
+ question.setGradeLevel(model.getGradeLevel());
question.setCreateTime(now);
question.setQuestionType(model.getQuestionType());
question.setStatus(QuestionStatusEnum.OK.getCode());
@@ -99,10 +104,10 @@
@Override
@Transactional
public Question updateFullQuestion(QuestionEditRequestVM model) {
- Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
+// Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
Question question = questionMapper.selectByPrimaryKey(model.getId());
question.setSubjectId(model.getSubjectId());
- question.setGradeLevel(gradeLevel);
+ question.setGradeLevel(model.getGradeLevel());
question.setScore(ExamUtil.scoreFromVM(model.getScore()));
question.setDifficult(model.getDifficult());
question.setCorrectFromVM(model.getCorrect(), model.getCorrectArray());
@@ -128,42 +133,50 @@
}
@Override
- public QuestionEditRequestVM getQuestionEditRequestVM(Integer questionId) {
+ public ExamQuestionVO getQuestionEditRequestVM(Integer questionId) {
//棰樼洰鏄犲皠
Question question = questionMapper.selectByPrimaryKey(questionId);
- return getQuestionEditRequestVM(question);
+ List<QuestionSubject> list = questionSubjectService.getQuestion(questionId).stream().map(e->{
+ SubjectPageRequestVM subject = new SubjectPageRequestVM();
+ subject.setId(e.getSubjectId());
+ e.setSubName(subjectMapper.page(subject).get(0).getName());
+ return e;
+ }).collect(Collectors.toList());
+ ExamQuestionVO questionEditRequestVM = getQuestionEditRequestVM(question);
+ questionEditRequestVM.setQuestionSubjects(list);
+ return questionEditRequestVM;
}
@Override
- public QuestionEditRequestVM getQuestionEditRequestVM(Question question) {
+ public ExamQuestionVO getQuestionEditRequestVM(Question question) {
//棰樼洰鏄犲皠
TextContent questionInfoTextContent = textContentService.selectById(question.getInfoTextContentId());
QuestionObject questionObject = JsonUtil.toJsonObject(questionInfoTextContent.getContent(), QuestionObject.class);
- QuestionEditRequestVM questionEditRequestVM = modelMapper.map(question, QuestionEditRequestVM.class);
+ ExamQuestionVO questionEditRequestVM = modelMapper.map(question, ExamQuestionVO.class);
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());
//棰樼洰椤规槧灏�
@@ -227,5 +240,15 @@
return questionSubjectService.removes(list.toArray(new Integer[list.size()]));
}
+ @Override
+ public List<Question> getAll() {
+ return questionMapper.getAll();
+ }
+
+ @Override
+ public List<Question> selectByIds(List<Integer> ids) {
+ return questionMapper.selectByIds(ids);
+ }
+
}
--
Gitblit v1.8.0