Merge remote-tracking branch 'origin/master'

xiangpei

2024-06-19 5ff3d0d90f6f46f9d48c6852884edb16ecc78ad3

 src/main/resources/mapper/ExamPaperMapper.xml

@@ -12,6 +12,7 @@
        <result column="visibility"  property="visibility"/>
        <result column="deduct_type" property="deductType"/>
        <result column="deduct_type_score"  property="deductTypeScore"/>
        <result column="content"  property="content"/>
        <result column="create_user"  property="createUser"/>
        <result column="create_time"  property="createTime"/>
        <result column="deleted"  property="deleted"/>
@@ -29,23 +30,23 @@
    </resultMap>


    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO">
    <select id="page" resultMap="BaseResultMap">
        SELECT
        <include refid="Base_Column_List"/>
        FROM t_exam_paper
        tep.*
        FROM t_exam_paper tep
        <where>
            and deleted=0
            and tep.deleted=0
            <if test="id != null ">
                and id= #{id}
                and tep.id= #{id}
            </if>
            <if test="name != null and name != ''">
                and name like concat('%',#{name},'%')
                and tep.name like concat('%',#{name},'%')
            </if>
            <if test="subjectId != null ">
                and subject_id= #{subjectId}
                and tep.subject_id= #{subjectId}
            </if>
            <if test="paperType != null ">
                and paper_type= #{paperType}
                and tep.paper_type= #{paperType}
            </if>
        </where>
    </select>