From 1dd3f8fdbbfc8a41f35a32f153201724a8faa2b3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 14 五月 2024 18:12:27 +0800
Subject: [PATCH] 保存顺序练习记录

---
 src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 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 8ff5b7e..b3bee77 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
@@ -274,18 +274,29 @@
 
     @Override
     public RestResponse selectContentById(Integer id) {
-        QuestionVO vo = questionMapper.selectContentById(id);
-        jsonQuestion(vo);
-        return RestResponse.ok(vo);
+        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) {
-        String content = questionMapper.getAnswer(id);
-        if (StringUtils.hasText(content)) {
-            QuestionContentVO vo = JSON.parseObject(content, QuestionContentVO.class);
+        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);

--
Gitblit v1.8.0