Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2024-06-26 44aaa355ecf9430f8b182654d03c2914287bcba6

 src/main/resources/mapper/QuestionMapper.xml

@@ -23,8 +23,15 @@
            parameterType="com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO">
        SELECT
        tq.*,
        CASE WHEN tq.question_type = 1 THEN '单选题' WHEN tq.question_type = 2 THEN '多选题' WHEN tq.question_type = 3 THEN
        '判断题' WHEN tq.question_type = 4 THEN '填空题' WHEN tq.question_type = 5 THEN '简答题' END AS questionTypeName,
        CASE WHEN tq.question_type = 1 THEN '单选题'
        WHEN tq.question_type = 2 THEN '多选题'
        WHEN tq.question_type = 3 THEN '判断题'
        WHEN tq.question_type = 4 THEN '填空题'
        WHEN tq.question_type = 5 THEN '简答题'
        WHEN tq.question_type = 6 THEN '语音题'
        WHEN tq.question_type = 7 THEN '计算题'
        WHEN tq.question_type = 8 THEN '分析题'
        END AS questionTypeName,
        ts.name AS subjectName,
        tu.real_name AS createUserName
        FROM t_question tq
@@ -85,4 +92,29 @@
        <foreach collection="questionIds" open="(" item="id" close=")" separator=",">#{id}</foreach>
    </select>

    <select id="selectBySubject" resultType="com.ycl.jxkg.domain.question.RandomQuestionDTO">
        SELECT
            id as questionId,question_type
        FROM
            t_question
        WHERE
            subject_id = #{subjectId}
            and question_type in
            <foreach collection="types" item="type" separator="," open="(" close=")">
                #{type}
            </foreach>
            and deleted = 0 and status = 1
    </select>

    <select id="getRandomQuestion" resultMap="BaseResultMap">
        SELECT
               *
        FROM
             t_question tq
        WHERE
              tq.subject_id = #{subjectId}
        ORDER BY
                 RAND()
        LIMIT #{num}
    </select>
</mapper>