Merge remote-tracking branch 'origin/master'

xiangpei

2024-06-19 5ff3d0d90f6f46f9d48c6852884edb16ecc78ad3

 src/main/resources/mapper/ClassesUserMapper.xml

@@ -21,6 +21,7 @@
        <result column="status" property="status" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
        <result column="phone" property="phone"/>
        <result column="update_time" property="updateTime"/>
        <result column="mark_paper_status" property="markPaperStatus" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
    </resultMap>


@@ -59,7 +60,8 @@
            TU.phone,
            EST.do_time,
            EST.status,
            EST.exam_submit
            EST.exam_submit,
            EST.mark_paper_status
        FROM
            t_classes_user TCU
            INNER JOIN t_user TU ON TU.id = TCU.user_id AND TCU.classes_id = #{classesId}
@@ -68,4 +70,9 @@
            TCU.deleted = 0
    </select>

    <select id="getClassesByUserId" resultType="java.lang.Integer">
        select classes_id
        from t_classes_user
        where user_id = #{userId} and deleted = 0
    </select>
</mapper>