From 065f6d3555d4125b6045ca2bb66d38030ba125a9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 15 七月 2024 09:03:39 +0800
Subject: [PATCH] 统计导出(待测试)
---
src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java | 110 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 89 insertions(+), 21 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..6040be6 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/SelfPracticeServiceImpl.java
@@ -7,8 +7,10 @@
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.PracticeModeENum;
import com.mindskip.xzs.domain.enums.PracticeQuestionTypeEnum;
import com.mindskip.xzs.domain.enums.PracticeTypeEnum;
import com.mindskip.xzs.domain.enums.QuestionTypeEnum;
@@ -16,10 +18,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 +44,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,13 +68,22 @@
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);
if (! CollectionUtils.isEmpty(subjectNames)) {
item.setSubjectNames(subjectNames.stream().collect(Collectors.joining("銆�")));
}
- item.setTotalQuestionNum(questionSubjectMapper.countQuestionNum(subjects));
+ item.setTotalQuestionNum(questionSubjectMapper.countQuestionNum(subjects, PracticeQuestionTypeEnum.getDataBaseValueByValue(item.getQuestionType())));
+ // 鏌ヨ宸茬粡鍋氫簡澶氬皯
+ 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 +105,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);
@@ -119,16 +148,10 @@
throw new RuntimeException("娌℃湁鎵惧埌棰樼洰锛屽彲鑳芥墍閫夎鐩寘鍚鐩笉瓒�");
}
QuestionVO questionVO = one.get(0);
- jsonQuestion(questionVO);
+ jsonQuestion(questionVO, Boolean.TRUE);
return RestResponse.ok(questionVO);
}
return RestResponse.ok();
- }
-
- @Override
- public RestResponse subjectQuestionNum(List<Integer> subjectIds) {
- Integer num = questionSubjectMapper.countQuestionNum(subjectIds);
- return RestResponse.ok(num);
}
@Override
@@ -143,9 +166,52 @@
throw new RuntimeException("娌℃湁鎵惧埌棰樼洰锛屽彲鑳芥墍閫夎鐩寘鍚鐩笉瓒�");
}
QuestionVO questionVO = one.get(0);
- jsonQuestion(questionVO);
+ jsonQuestion(questionVO, Boolean.TRUE);
return RestResponse.ok(questionVO);
+ }
+
+ @Override
+ public RestResponse startLook(Integer id) {
+ SelfPractice en = selfPracticeMapper.selectById(id);
+ if (Objects.isNull(en)) {
+ throw new RuntimeException("缁冧範涓嶅瓨鍦�");
+ }
+ List<Integer> subjectIds = JSON.parseArray(en.getSubjects(), Integer.class);
+ if (PracticeTypeEnum.ORDERED.getValue().equals(en.getPracticeType())) {
+ List<SubjectQuestionVO> list = new ArrayList<>(2);
+ // 椤哄簭鍋氶锛屾妸閫夋嫨鐨勯搴撶殑棰�(id)鍏ㄩ儴鏌ュ嚭鏉ワ紝鍓嶇鏈変釜搴忓彿闈㈡澘锛岀偣鍑诲摢閬撻鍋氬摢閬�
+ for (Integer subjectId : subjectIds) {
+ // 鏌ヨ鐩悕瀛�
+ String subjectName = subjectMapper.selectSubjectNameById(subjectId);
+ List<QuestionVO> questionVOs = new ArrayList<>();
+ if (PracticeQuestionTypeEnum.ALL.getValue().equals(en.getQuestionType())) {
+ questionVOs = questionSubjectMapper.bySubjectId(subjectId);
+ } else {
+ questionVOs = questionSubjectMapper.bySubjectIdAndQuestionType(subjectId, PracticeQuestionTypeEnum.getDataBaseValueByValue(en.getQuestionType()));
+ }
+ questionVOs.stream().forEach(question -> {
+ question.setContent(JSON.parseObject(question.getContentJson(), QuestionContentVO.class));
+ });
+ // 杩斿洖鍝嶅簲鏁版嵁
+ SubjectQuestionVO subjectQuestionVO = new SubjectQuestionVO();
+ subjectQuestionVO.setSubjectId(subjectId);
+ subjectQuestionVO.setSubjectName(subjectName);
+ subjectQuestionVO.setLookQuestionList(questionVOs);
+ list.add(subjectQuestionVO);
+ }
+ return RestResponse.ok(list);
+ } else if (PracticeTypeEnum.RANDOM.getValue().equals(en.getPracticeType())) {
+ // 闅忔満缁冧範锛屾槸涓�閬撻涓�閬撻缁冧範
+ List<QuestionVO> one = questionSubjectMapper.getRandomQuestionId(subjectIds, PracticeQuestionTypeEnum.getDataBaseValueByValue(en.getQuestionType()), 1);
+ if (one.size() < 1) {
+ throw new RuntimeException("娌℃湁鎵惧埌棰樼洰锛屽彲鑳芥墍閫夎鐩寘鍚鐩笉瓒�");
+ }
+ QuestionVO questionVO = one.get(0);
+ jsonQuestion(questionVO, Boolean.FALSE);
+ return RestResponse.ok(questionVO);
+ }
+ return RestResponse.ok();
}
/**
@@ -153,7 +219,7 @@
*
* @param questionVO
*/
- public void jsonQuestion(QuestionVO questionVO) {
+ public void jsonQuestion(QuestionVO questionVO, Boolean clearAnswer) {
if (StringUtils.hasText(questionVO.getContentJson())) {
QuestionContentVO questionContent = JSON.parseObject(questionVO.getContentJson(), QuestionContentVO.class);
questionVO.setContent(questionContent);
@@ -164,9 +230,11 @@
questionVO.setAnswerNum(questionVO.getCorrect().split(",").length);
}
}
- questionVO.setContentJson("");
- questionVO.setCorrect("");
- questionVO.getContent().setCorrect("");
- questionVO.getContent().setAnalyze("");
+ if (clearAnswer) {
+ questionVO.setContentJson("");
+ questionVO.setCorrect("");
+ questionVO.getContent().setCorrect("");
+ questionVO.getContent().setAnalyze("");
+ }
}
}
--
Gitblit v1.8.0