From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题
---
src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java | 182 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 160 insertions(+), 22 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..956e398 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
@@ -1,5 +1,8 @@
package com.mindskip.xzs.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.mindskip.xzs.base.RestResponse;
+import com.mindskip.xzs.domain.DeptQuestion;
import com.mindskip.xzs.domain.QuestionSubject;
import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.Question;
@@ -8,28 +11,43 @@
import com.mindskip.xzs.domain.enums.QuestionTypeEnum;
import com.mindskip.xzs.domain.question.QuestionItemObject;
import com.mindskip.xzs.domain.question.QuestionObject;
+import com.mindskip.xzs.domain.vo.DeptQuestionVO;
+import com.mindskip.xzs.domain.vo.QuestionContentVO;
+import com.mindskip.xzs.domain.vo.QuestionVO;
+import com.mindskip.xzs.repository.BaseMapper;
+import com.mindskip.xzs.repository.DeptQuestionMapper;
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;
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;
import com.mindskip.xzs.viewmodel.admin.question.QuestionEditRequestVM;
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.QuestionExportData;
+import com.mindskip.xzs.vo.QuestionExportVO;
+import com.mindskip.xzs.vo.QuestionImportVO;
+import com.mindskip.xzs.vo.QuestionSubjectVO;
+import lombok.RequiredArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@Service
@@ -40,14 +58,17 @@
private final TextContentService textContentService;
private final SubjectService subjectService;
private final QuestionSubjectService questionSubjectService;
+ private final SubjectMapper subjectMapper;
+ private final DeptQuestionMapper deptQuestionMapper;
- @Autowired
- public QuestionServiceImpl(QuestionMapper questionMapper, TextContentService textContentService, SubjectService subjectService, QuestionSubjectService questionSubjectService) {
- super(questionMapper);
- this.textContentService = textContentService;
+ public QuestionServiceImpl(BaseMapper<Question> baseMapper, QuestionMapper questionMapper, TextContentService textContentService, SubjectService subjectService, QuestionSubjectService questionSubjectService, SubjectMapper subjectMapper, DeptQuestionMapper deptQuestionMapper) {
+ super(baseMapper);
this.questionMapper = questionMapper;
+ this.textContentService = textContentService;
this.subjectService = subjectService;
this.questionSubjectService = questionSubjectService;
+ this.subjectMapper = subjectMapper;
+ this.deptQuestionMapper = deptQuestionMapper;
}
@Override
@@ -62,17 +83,16 @@
@Transactional
public Question insertFullQuestion(QuestionEditRequestVM model, Integer userId) {
Date now = new Date();
-// Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
- //棰樺共銆佽В鏋愩�侀�夐」绛� 鎻掑叆
+ // 棰樺共銆佽В鏋愩�侀�夐」绛� 鎻掑叆
TextContent infoTextContent = new TextContent();
infoTextContent.setCreateTime(now);
setQuestionInfoFromVM(infoTextContent, model);
textContentService.insertByFilter(infoTextContent);
+ // 棰樼洰鎻掑叆
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());
@@ -84,8 +104,21 @@
question.setDeleted(false);
questionMapper.insertSelective(question);
+ // 棰樼洰鎵�灞為儴闂ㄦ彃鍏�
+ if (! CollectionUtils.isEmpty(model.getDeptIds())) {
+ List<DeptQuestion> deptQuestions = model.getDeptIds().stream().map(deptId -> {
+ DeptQuestion deptQuestion = new DeptQuestion();
+ deptQuestion.setQuestionId(question.getId());
+ deptQuestion.setDeptId(deptId);
+ return deptQuestion;
+ }).collect(Collectors.toList());
+ if (! CollectionUtils.isEmpty(model.getDeptIds())) {
+ deptQuestionMapper.add(deptQuestions);
+ }
+ }
+
//鎵归噺娣诲姞
- List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e->{
+ List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e -> {
QuestionSubject questionSubject = new QuestionSubject();
questionSubject.setQuestionId(question.getId());
questionSubject.setSubjectId(e);
@@ -99,14 +132,27 @@
@Override
@Transactional
public Question updateFullQuestion(QuestionEditRequestVM model) {
- 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());
questionMapper.updateByPrimaryKeySelective(question);
+
+ // 澶勭悊棰樼洰鎵�灞為儴闂�
+ deptQuestionMapper.remove(question.getId());
+ List<DeptQuestion> deptQuestions = model.getDeptIds().stream().map(deptId -> {
+ DeptQuestion deptQuestion = new DeptQuestion();
+ deptQuestion.setQuestionId(question.getId());
+ deptQuestion.setDeptId(deptId);
+ return deptQuestion;
+ }).collect(Collectors.toList());
+ if (! CollectionUtils.isEmpty(model.getDeptIds())) {
+ deptQuestionMapper.add(deptQuestions);
+ }
//棰樺共銆佽В鏋愩�侀�夐」绛� 鏇存柊
TextContent infoTextContent = textContentService.selectById(question.getInfoTextContentId());
@@ -115,7 +161,7 @@
questionSubjectService.removeQuestionId(question.getId());
//鎵归噺娣诲姞
- List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e->{
+ List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e -> {
QuestionSubject questionSubject = new QuestionSubject();
questionSubject.setQuestionId(question.getId());
questionSubject.setSubjectId(e);
@@ -128,18 +174,30 @@
}
@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);
+ // 鏌ヨ棰樼洰鎵�灞為儴闂�
+ List<Integer> deptIds = deptQuestionMapper.deptByQuestionId(questionId)
+ .stream().map(DeptQuestionVO::getDeptId).collect(Collectors.toList());
+ questionEditRequestVM.setDeptIds(deptIds);
+ 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());
//绛旀
@@ -221,11 +279,91 @@
question.setDeleted(true);
questionMapper.updateByPrimaryKeySelective(question);
List<Integer> list = questionSubjectService.getQuestion(id)
- .stream().map(e->{
+ .stream().map(e -> {
return e.getId();
}).collect(Collectors.toList());
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);
+ }
+
+
+ @Override
+ public List<QuestionImportVO> export(QuestionExportVO query) {
+ return questionMapper.export(query);
+ }
+
+ @Override
+ public List<QuestionImportVO> exportData(QuestionExportVO query) {
+ return questionMapper.exportData(query);
+ }
+
+ @Override
+ public PageInfo<QuestionPageStudentResponseVM> selectQuestion(QuestionPageStudentRequestVM model) {
+ return PageHelper.startPage(model.getPageIndex(), model.getPageSize()).doSelectPageInfo(() ->
+ questionMapper.selectQuestion(model).stream().peek(
+ q -> q.setShortTitle(HtmlUtil.clear(q.getShortTitle()))
+ ).collect(Collectors.toList())
+ );
+ }
+
+ @Override
+ public RestResponse selectContentById(Integer id) {
+ QuestionVO questionVO = questionMapper.selectContentById(id);
+ jsonQuestion(questionVO);
+ if (QuestionTypeEnum.MultipleChoice.getCode().equals(questionVO.getQuestionType())) {
+ // 澶氶�夐闇�瑕佽繑鍥炵瓟妗堟暟閲忥紝瀛﹀憳閫変腑瀵瑰簲鏁伴噺鎵嶆煡璇㈢瓟妗�
+ if (StringUtils.hasText(questionVO.getCorrect())) {
+ questionVO.setAnswerNum(questionVO.getCorrect().split(",").length);
+ }
+ }
+ questionVO.setContentJson("");
+ questionVO.setCorrect("");
+ questionVO.getContent().setCorrect("");
+ questionVO.getContent().setAnalyze("");
+ return RestResponse.ok(questionVO);
+ }
+
+ @Override
+ public RestResponse getAnswer(Integer id) {
+ QuestionVO questionVO = questionMapper.getAnswer(id);
+ if (Objects.nonNull(questionVO) && StringUtils.hasText(questionVO.getCorrect())) {
+ QuestionContentVO vo = JSON.parseObject(questionVO.getContentJson(), QuestionContentVO.class);
+ vo.setQuestionItemObjects(null);
+ vo.setTitleContent(null);
+ vo.setCorrect(questionVO.getCorrect());
+ return RestResponse.ok(vo);
+ }
+ return RestResponse.ok(null);
+ }
+
+ @Override
+ public Integer countQuestionByTitle(String title) {
+ return questionMapper.countQuestionByTitle(title);
+ }
+
+ @Override
+ public List<QuestionSubjectVO> countQuestionByTitleAndSubject(String title, Integer subjectId) {
+ return questionMapper.countQuestionByTitleAndSubject(title, subjectId);
+ }
+
+ /**
+ * 澶勭悊棰樼洰鍐呭JSON
+ *
+ * @param vo
+ */
+ public void jsonQuestion(QuestionVO vo) {
+ if (StringUtils.hasText(vo.getContentJson())) {
+ QuestionContentVO questionContent = JSON.parseObject(vo.getContentJson(), QuestionContentVO.class);
+ vo.setContent(questionContent);
+ }
+ }
}
--
Gitblit v1.8.0