Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-03 6c87a7ad0ae6ae9b5d8b6ab4d0e5b93169171972

 src/main/resources/mapper/ExamPaperMapper.xml

@@ -26,7 +26,7 @@
    deleted, task_exam_id
    </sql>

    <resultMap id="PaperInfoResultMap" type="com.ycl.jxkg.vo.student.dashboard.PaperInfo">
    <resultMap id="PaperInfoResultMap" type="com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="name" jdbcType="VARCHAR" property="name"/>
        <result column="limit_start_time" jdbcType="TIMESTAMP" property="limitStartTime"/>
@@ -34,7 +34,7 @@
    </resultMap>


    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.exam.ExamPaperPageRequestVO">
    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO">
        SELECT
        <include refid="Base_Column_List"/>
        FROM t_exam_paper
@@ -56,7 +56,7 @@
    </select>

    <select id="taskExamPage" resultMap="BaseResultMap"
            parameterType="com.ycl.jxkg.vo.admin.exam.ExamPaperPageRequestVO">
            parameterType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO">
        SELECT
        <include refid="Base_Column_List"/>
        FROM t_exam_paper
@@ -68,7 +68,7 @@
        </where>
    </select>

    <select id="studentPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.student.exam.ExamPaperPageVO">
    <select id="studentPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO">
        SELECT
        <include refid="Base_Column_List"/>
        FROM t_exam_paper
@@ -85,7 +85,7 @@
    </select>

    <select id="indexPaper" resultMap="PaperInfoResultMap"
            parameterType="com.ycl.jxkg.vo.student.dashboard.PaperFilter">
            parameterType="com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter">
        SELECT id,name,limit_start_time,limit_end_time
        FROM t_exam_paper
        <where>