From d910a3e7ad5bc3a5e5443f506d05bbb9e83a4c8e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 17:14:33 +0800
Subject: [PATCH] 生成试卷时如果题目列表为空,则不反悔这个题型的数据

---
 src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 71ed6b3..d375fe4 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -300,6 +300,9 @@
                 for (PaperSettingItem settingItem : settingList) {
                     Integer num = settingItem.getNum();
                     Integer difficult = settingItem.getDifficult();
+                    if(difficult == 0){
+                        difficult = null;
+                    }
                     //闇�瑕侀厤缃殑棰樼洰鏁伴噺涓�0鍒欒烦杩�
                     if (num == null || num == 0) continue;
                     List<Question> questions = questionMapper.getRandomQuestion(settingItem.getSubjectId(), paperSetting.getQuestionType(), difficult, settingItem.getNum());
@@ -344,7 +347,9 @@
                     childQuestionList.addAll(childQuestions);
                 }
                 paperFixQuestionVO.setQuestionList(childQuestionList);
-                examData.add(paperFixQuestionVO);
+                if (! CollectionUtils.isEmpty(childQuestionList)) {
+                    examData.add(paperFixQuestionVO);
+                }
             }
         }
         ExamSubmitTemp examSubmitTemp = new ExamSubmitTemp();
@@ -382,7 +387,6 @@
                 doQuestionVO.setQuestionType(item.getQuestionType());
                 //澧炲姞棰樼洰鍒嗘暟
                 doQuestionVO.setQuestionScore(question.getScore());
-
                 // 棰樼洰鍓湰
                 QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO();
                 copy.setId(question.getId());

--
Gitblit v1.8.0