From d823860098f54886d416c41755634c1c5a45b6e1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 08 七月 2024 09:44:16 +0800
Subject: [PATCH] 填空题答案bug

---
 src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index c4c8bfa..87992df 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -373,6 +373,24 @@
                 doQuestionVO.setQuestionType(item.getQuestionType());
                 //澧炲姞棰樼洰鍒嗘暟
                 doQuestionVO.setQuestionScore(question.getScore());
+
+                // 棰樼洰鍓湰
+                QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO();
+                copy.setId(question.getId());
+                copy.setAnalyze(question.getAnalyze());
+                copy.setDifficult(question.getDifficult());
+                //濉┖鐨勭瓟妗堝湪Json閲�
+                if (QuestionTypeEnum.GapFilling.getCode().equals(item.getQuestionType())) {
+                    List<String> gapAnswer = new ArrayList<>();
+                    for (QuestionItemObject questionItemObject : question.getItems()) {
+                        gapAnswer.add(questionItemObject.getContent());
+                    }
+                    copy.setCorrect(String.join(ANSWER_SPLIT, gapAnswer));
+                } else {
+                    copy.setCorrect(question.getCorrect());
+                }
+                questionAnswerCopyVOList.add(copy);
+
                 // 濉┖棰橀渶瑕佹姽闄ontent(鍥犱负鏄瓟妗�)
                 if (QuestionTypeEnum.GapFilling.getCode().equals(doQuestionVO.getQuestionType())) {
                     question.getItems().stream().forEach(option -> {
@@ -383,24 +401,6 @@
                 doQuestionVO.setId(question.getId());
                 doQuestionVO.setOriginalFile(question.getOriginalFile());
                 doQuestionVO.setAudioFile(question.getAudioFile());
-
-                // 棰樼洰鍓湰
-                QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO();
-                copy.setId(question.getId());
-                copy.setAnalyze(question.getAnalyze());
-                copy.setDifficult(question.getDifficult());
-                //濉┖鐨勭瓟妗堝湪Json閲�
-                if (QuestionTypeEnum.GapFilling.getCode().equals(item.getQuestionType())) {
-                    List<String> gapAnswer = new ArrayList<>();
-                    for (QuestionItemObject questionItemObject : doQuestionVO.getQuestionItemList()) {
-                        gapAnswer.add(questionItemObject.getContent());
-                    }
-                    copy.setCorrect(String.join(ANSWER_SPLIT, gapAnswer));
-                } else {
-                    copy.setCorrect(question.getCorrect());
-                }
-                questionAnswerCopyVOList.add(copy);
-
                 return doQuestionVO;
             }).collect(Collectors.toList());
             if (ExamPaperTypeEnum.RandomOrder.getCode().equals(examPaper.getPaperType())) {

--
Gitblit v1.8.0