From c50e176c4a6b9331d2d1c0520bafb18f54f0dee6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 08 三月 2024 17:35:10 +0800
Subject: [PATCH] 部门增加管理员
---
src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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..245f919 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,7 @@
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.QuestionEditItemVM;
import com.mindskip.xzs.viewmodel.admin.question.QuestionEditRequestVM;
import com.mindskip.xzs.viewmodel.admin.question.QuestionPageRequestVM;
@@ -40,14 +42,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 +76,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 +103,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());
@@ -131,7 +135,15 @@
public QuestionEditRequestVM 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());
+ QuestionEditRequestVM questionEditRequestVM = getQuestionEditRequestVM(question);
+ questionEditRequestVM.setQuestionSubjects(list);
+ return questionEditRequestVM;
}
@Override
@@ -227,5 +239,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