From a745c3b358b97b468711a0ecac11dbe2d5d24018 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 01 七月 2024 21:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/ClassesUserMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/ClassesUserMapper.xml b/src/main/resources/mapper/ClassesUserMapper.xml
index 3d1df1e..c3cc51f 100644
--- a/src/main/resources/mapper/ClassesUserMapper.xml
+++ b/src/main/resources/mapper/ClassesUserMapper.xml
@@ -18,10 +18,10 @@
<result column="real_name" property="realName"/>
<result column="do_time" property="doTime"/>
<result column="exam_submit" property="examSubmit"/>
- <result column="status" property="status" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
+ <result column="status" property="status" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
<result column="phone" property="phone"/>
<result column="update_time" property="updateTime"/>
- <result column="mark_paper_status" property="markPaperStatus" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
+ <result column="mark_paper_status" property="markPaperStatus" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
</resultMap>
@@ -46,7 +46,7 @@
TU.phone
FROM t_classes_user TCU
LEFT JOIN t_user TU ON TU.id = TCU.user_id
- WHERE TCU.deleted = 0
+ WHERE TCU.deleted = 0 AND TCU.classes_id = #{query.classesId}
<if test="query.studentName != null and query.studentName != ''">AND TU.real_name like concat('%',
#{query.studentName}, '%')
</if>
@@ -67,7 +67,7 @@
INNER JOIN t_user TU ON TU.id = TCU.user_id AND TCU.classes_id = #{classesId}
LEFT JOIN t_exam_submit_temp EST ON EST.user_id = TU.id
WHERE
- TCU.deleted = 0
+ TCU.deleted = 0 and EST.deleted = 0 and EST.exam_id = #{examId}
</select>
<select id="getClassesByUserId" resultType="java.lang.Integer">
--
Gitblit v1.8.0