From ccca8c65b3c76a9021a471a3667d61d965a4f2cb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 11 五月 2024 18:04:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/service/QuestionService.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/QuestionService.java b/src/main/java/com/mindskip/xzs/service/QuestionService.java
index 72d8671..a098ffc 100644
--- a/src/main/java/com/mindskip/xzs/service/QuestionService.java
+++ b/src/main/java/com/mindskip/xzs/service/QuestionService.java
@@ -1,9 +1,13 @@
 package com.mindskip.xzs.service;
 
 import com.mindskip.xzs.domain.Question;
+import com.mindskip.xzs.viewmodel.admin.question.ExamQuestionVO;
 import com.mindskip.xzs.viewmodel.admin.question.QuestionEditRequestVM;
 import com.mindskip.xzs.viewmodel.admin.question.QuestionPageRequestVM;
 import com.github.pagehelper.PageInfo;
+import com.mindskip.xzs.vo.QuestionExportVO;
+import com.mindskip.xzs.vo.QuestionImportVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,13 +19,24 @@
 
     Question updateFullQuestion(QuestionEditRequestVM model);
 
-    QuestionEditRequestVM getQuestionEditRequestVM(Integer questionId);
+    ExamQuestionVO getQuestionEditRequestVM(Integer questionId);
 
-    QuestionEditRequestVM getQuestionEditRequestVM(Question question);
+    ExamQuestionVO getQuestionEditRequestVM(Question question);
 
     Integer selectAllCount();
 
     List<Integer> selectMothCount();
 
     Integer remove(Integer id);
+
+    List<Question> getAll();
+
+    List<Question> selectByIds(@Param("ids") List<Integer> ids);
+
+    /**
+     * 棰樼洰瀵煎嚭鏁版嵁
+     * @param query
+     * @return
+     */
+    List<QuestionImportVO> export(QuestionExportVO query);
 }

--
Gitblit v1.8.0