From fff73372b4b443d2920f09d2e83702fec07521a6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 22 五月 2024 12:02:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java b/src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java
index bdb4835..c77a9c6 100644
--- a/src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java
@@ -32,8 +32,17 @@
     List<QuestionSubject> getSubject(Integer id);
 
     /** 缁熻璇剧洰鐨勯鐩暟 */
-    Integer countQuestionNum(@Param("subjects") List<Integer> subjects);
+    Integer countQuestionNum(@Param("subjects") List<Integer> subjects, @Param("questionType") Integer questionType);
 
     /** 闅忔満棰樼洰 */
-    List<QuestionVO> getRandomQuestionId(@Param("subjectIds") List<Integer> subjectIds, @Param("questionNum") Integer questionNum);
+    List<QuestionVO> getRandomQuestionId(@Param("subjectIds") List<Integer> subjectIds, @Param("questionType") Integer questionType, @Param("questionNum") Integer questionNum);
+
+    /** 鏌ヨ棰樼洰ID锛屾牴鎹鐩甶ds */
+    List<Integer> questionsBySubjectIds(@Param("subjectIds") List<Integer> subjectIds);
+
+    /** 鏌ヨ棰樼洰ID鏍规嵁璇剧洰id */
+    List<Integer> questionsBySubjectId(Integer subjectId);
+
+    /** 鏍规嵁璇剧洰鍜岄鍨嬫煡璇㈤鐩甀D */
+    List<Integer> questionsBySubjectIdAndQuestionType(@Param("subjectId") Integer subjectId, @Param("questionType") Integer questionType);
 }

--
Gitblit v1.8.0