From 851990e521ed5b0cb0e367b319bb484f04c4c47e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 15 五月 2024 15:40:47 +0800
Subject: [PATCH] 在线练习完善
---
src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java
index dba31af..1968c85 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java
@@ -7,6 +7,7 @@
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.context.WebContext;
import com.mindskip.xzs.domain.ExamPaperAnswer;
+import com.mindskip.xzs.domain.PracticeQuestionCondition;
import com.mindskip.xzs.domain.Question;
import com.mindskip.xzs.domain.SelfPractice;
import com.mindskip.xzs.domain.enums.PracticeQuestionTypeEnum;
@@ -16,10 +17,7 @@
import com.mindskip.xzs.domain.vo.QuestionVO;
import com.mindskip.xzs.domain.vo.SelfPracticeVO;
import com.mindskip.xzs.domain.vo.SubjectQuestionVO;
-import com.mindskip.xzs.repository.QuestionMapper;
-import com.mindskip.xzs.repository.QuestionSubjectMapper;
-import com.mindskip.xzs.repository.SelfPracticeMapper;
-import com.mindskip.xzs.repository.SubjectMapper;
+import com.mindskip.xzs.repository.*;
import com.mindskip.xzs.service.SelfPracticeService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -45,7 +43,7 @@
private final WebContext webContext;
private final QuestionSubjectMapper questionSubjectMapper;
private final SubjectMapper subjectMapper;
- private final QuestionMapper questionMapper;
+ private final PracticeQuestionConditionMapper practiceQuestionConditionMapper;
@Override
public RestResponse add(SelfPracticeVO vo) {
@@ -69,6 +67,7 @@
PageInfo<SelfPracticeVO> info = PageHelper.startPage(query.getPageNum(), query.getPageSize()).doSelectPageInfo(() ->
selfPracticeMapper.page(query));
info.getList().stream().forEach(item -> {
+ // 鏌ヨ璇剧洰鍚嶃�佽鐩�讳綋鏁�
List<Integer> subjects = JSON.parseArray(item.getSubjectString(), Integer.class);
item.setSubjects(subjects);
List<String> subjectNames = subjectMapper.selectSubjectName(subjects);
@@ -76,6 +75,14 @@
item.setSubjectNames(subjectNames.stream().collect(Collectors.joining("銆�")));
}
item.setTotalQuestionNum(questionSubjectMapper.countQuestionNum(subjects));
+ // 鏌ヨ宸茬粡鍋氫簡澶氬皯
+ PracticeQuestionCondition practiceQuestionCondition = practiceQuestionConditionMapper.selectByPracticeId(item.getId());
+ if (Objects.nonNull(practiceQuestionCondition)) {
+ List<PracticeQuestionCondition.QuestionFinishCondition> questionFinishConditions = JSON.parseArray(practiceQuestionCondition.getContent(), PracticeQuestionCondition.QuestionFinishCondition.class);
+ item.setDoNum(questionFinishConditions.size());
+ } else {
+ item.setDoNum(0);
+ }
});
return RestResponse.ok(info);
}
@@ -97,18 +104,39 @@
List<SubjectQuestionVO> list = new ArrayList<>(2);
// 椤哄簭鍋氶锛屾妸閫夋嫨鐨勯搴撶殑棰�(id)鍏ㄩ儴鏌ュ嚭鏉ワ紝鍓嶇鏈変釜搴忓彿闈㈡澘锛岀偣鍑诲摢閬撻鍋氬摢閬�
for (Integer subjectId : subjectIds) {
+ // 鏌ヨ鐩悕瀛�
String subjectName = subjectMapper.selectSubjectNameById(subjectId);
- // todo鏍规嵁鍋氶璁板綍鏌ヨ鍋氭病鍋氳繃
List<Integer> questionIds = new ArrayList<>();
if (PracticeQuestionTypeEnum.ALL.getValue().equals(en.getQuestionType())) {
questionIds = questionSubjectMapper.questionsBySubjectId(subjectId);
} else {
questionIds = questionSubjectMapper.questionsBySubjectIdAndQuestionType(subjectId, PracticeQuestionTypeEnum.getDataBaseValueByValue(en.getQuestionType()));
}
+ // 鏍规嵁鍋氶璁板綍澧炲姞鏍囪瘑锛岄〉闈㈡覆鏌撳仛娌″仛杩囷紝鍋氬娌℃湁
+ PracticeQuestionCondition practiceQuestionCondition = practiceQuestionConditionMapper.selectByPracticeId(id);
+ List<PracticeQuestionCondition.QuestionFinishCondition> questionFinishConditions = new ArrayList<>(48);
+ if (Objects.nonNull(practiceQuestionCondition)) { // json鍙嶅簭鍒楀寲寰楀埌鍋氶鎯呭喌
+ questionFinishConditions = JSON.parseArray(practiceQuestionCondition.getContent(), PracticeQuestionCondition.QuestionFinishCondition.class);
+ }
+ List<PracticeQuestionCondition.QuestionFinishCondition> finalQuestionFinishConditions = questionFinishConditions;
+ // 缁勮鍓嶇鏁版嵁
+ List<PracticeQuestionCondition.QuestionFinishCondition> questionData = questionIds.stream().map(questionId -> {
+ PracticeQuestionCondition.QuestionFinishCondition questionPractice = new PracticeQuestionCondition.QuestionFinishCondition();
+ questionPractice.setQuestionId(questionId);
+ for (PracticeQuestionCondition.QuestionFinishCondition questionFinishCondition : finalQuestionFinishConditions) {
+ if (questionFinishCondition.getQuestionId().equals(questionId)) {
+ questionPractice.setRight(questionFinishCondition.getRight());
+ questionPractice.setAnswer(questionFinishCondition.getAnswer());
+ questionPractice.setHasDo(questionFinishCondition.getHasDo());
+ }
+ }
+ return questionPractice;
+ }).collect(Collectors.toList());
+ // 杩斿洖鍝嶅簲鏁版嵁
SubjectQuestionVO subjectQuestionVO = new SubjectQuestionVO();
subjectQuestionVO.setSubjectId(subjectId);
subjectQuestionVO.setSubjectName(subjectName);
- subjectQuestionVO.setQuestionIds(questionIds);
+ subjectQuestionVO.setQuestionConditions(questionData);
list.add(subjectQuestionVO);
}
return RestResponse.ok(list);
--
Gitblit v1.8.0