Merge remote-tracking branch 'origin/master'

xiangpei

2024-06-19 5ff3d0d90f6f46f9d48c6852884edb16ecc78ad3

 src/main/resources/mapper/QuestionMapper.xml

@@ -29,6 +29,8 @@
        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
@@ -90,14 +92,18 @@
        <foreach collection="questionIds" open="(" item="id" close=")" separator=",">#{id}</foreach>
    </select>

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

</mapper>