From 83953fac1e778b6de84efaa09bc6913fed2e0b12 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 29 十月 2024 16:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java b/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java
index 9b2503a..721dbd0 100644
--- a/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java
+++ b/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java
@@ -1,8 +1,12 @@
package com.ycl.jxkg.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.domain.other.KeyValue;
-import com.ycl.jxkg.domain.Question;
-import com.ycl.jxkg.vo.admin.question.QuestionPageRequestVO;
+import com.ycl.jxkg.domain.question.RandomQuestionDTO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperImportVO;
+import com.ycl.jxkg.domain.vo.admin.exam.QuestionExportVO;
+import com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -19,4 +23,27 @@
Integer selectAllCount();
List<KeyValue> selectCountByDate(@Param("startTime") Date startTime,@Param("endTime") Date endTime);
+
+ /**
+ * 鑾峰彇棰樼洰锛氶鍨嬨�佺瓟妗�
+ *
+ * @param questionIds
+ * @return
+ */
+ List<Question> getAnswerInfo(@Param("questionIds") List<Integer> questionIds);
+
+ Integer selectByDifAndSub(RandomQuestionDTO dto);
+
+ /**
+ * 鑾峰彇闅忔満棰�
+ *
+ * @param subjectId 璇剧洰
+ * @param questionType 棰樺瀷
+ * @param num 鏁伴噺
+ * @return
+ */
+ List<Question> getRandomQuestion(@Param("subjectId") Integer subjectId, @Param("questionType") Integer questionType,@Param("difficult") Integer difficult, @Param("num") Integer num);
+
+ List<ExamPaperImportVO> export(@Param("query") QuestionExportVO query);
+
}
--
Gitblit v1.8.0