Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-07 0879a157fd7c85ec34f1dac51a2b113bf1f5f2f6

 src/main/resources/mapper/ClassesMapper.xml

@@ -6,10 +6,16 @@
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.vo.ClassesVO">
        <result column="class_name" property="className" />
        <result column="create_user" property="createUser" />
        <result column="real_name" property="createUserName" />
        <result column="phone" property="teacherPhone" />
        <result column="create_time" property="createTime" />
        <result column="classes_number" property="classesNumber" />
        <result column="status" property="status" />
        <result column="status" property="status" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
        <result column="verify_status" property="verifyStatus" />
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
        <result column="remark" property="remark" />
        <result column="create_time" property="createTime" />
    </resultMap>


@@ -26,6 +32,10 @@
            TC.classes_number,
            TC.status,
            TC.verify_status,
            TC.start_time,
            TC.end_time,
            TC.remark,
            TC.create_time,
            TC.id
        FROM
            t_classes TC
@@ -41,12 +51,25 @@
            TC.create_time,
            TC.classes_number,
            TC.status,
            TC.create_time,
            TC.verify_status,
            TC.id
            TC.start_time,
            TC.end_time,
            TC.remark,
            TC.id,
            TU.real_name,
            TU.phone
        FROM
            t_classes TC
                LEFT JOIN t_user TU ON TU.id = TC.create_user AND TU.deleted = 0
        WHERE
            TC.deleted = 0
            <if test="query.className != null and query.className != ''">
                AND TC.class_name like concat('%', #{query.className}, '%')
            </if>
            <if test="query.status != null and query.status != ''">
                AND TC.status = #{query.status}
            </if>
    </select>

</mapper>