From f4f84ef25ce94e59dfe57961fcbb3c81f738ebb8 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 17 五月 2024 16:26:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java | 4 ++-- 1 files changed, 2 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 771188c..c77a9c6 100644 --- a/src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java +++ b/src/main/java/com/mindskip/xzs/repository/QuestionSubjectMapper.java @@ -32,10 +32,10 @@ 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); -- Gitblit v1.8.0