Merge remote-tracking branch 'origin/master'

luohairen

2024-10-29 ea3bcc24543202a55b22623cad8dd8900d550242

 src/main/resources/mapper/ClassesUserMapper.xml

@@ -10,6 +10,10 @@
        <result column="sex" property="sex"/>
        <result column="phone" property="phone"/>
        <result column="create_time" property="createTime"/>
        <result column="user_name" property="userName"/>
        <result column="age" property="age"/>
        <result column="birth_day" property="birthDay"/>
        <result column="status" property="status"/>
    </resultMap>

    <resultMap id="ResultMap" type="com.ycl.jxkg.domain.vo.StudentExamInfoVO">
@@ -43,13 +47,18 @@
        TCU.id,
        TU.real_name,
        TU.sex,
        TU.phone
        TU.phone,
        TU.user_name,
        TU.age,
        TU.birth_day,
        TU.status
        FROM t_classes_user TCU
        LEFT JOIN t_user TU ON TU.id = TCU.user_id and TU.deleted = 0
        WHERE TCU.deleted = 0 AND TCU.classes_id = #{query.classesId}
        WHERE TCU.deleted = 0 AND TCU.classes_id = #{query.classesId} AND TCU.teacher = 0
        <if test="query.studentName != null and query.studentName != ''">AND TU.real_name like concat('%',
            #{query.studentName}, '%')
        </if>
        order by TU.id desc
    </select>


@@ -62,7 +71,7 @@
            t_classes_user TCU
            INNER JOIN t_user TU ON TU.id = TCU.user_id AND TCU.classes_id = #{classesId}
        WHERE
            TCU.deleted = 0
            TCU.deleted = 0 AND TCU.teacher = 0
    </select>

    <select id="getClassesByUserId" resultType="java.lang.Integer">