From 5ff3d0d90f6f46f9d48c6852884edb16ecc78ad3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 六月 2024 13:28:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ClassesUserMapper.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/ClassesUserMapper.xml b/src/main/resources/mapper/ClassesUserMapper.xml
index 9fc5347..3d1df1e 100644
--- a/src/main/resources/mapper/ClassesUserMapper.xml
+++ b/src/main/resources/mapper/ClassesUserMapper.xml
@@ -12,6 +12,18 @@
<result column="create_time" property="createTime"/>
</resultMap>
+ <resultMap id="ResultMap" type="com.ycl.jxkg.domain.vo.StudentExamInfoVO">
+ <result column="id" property="userId"/>
+ <result column="phone" property="phone"/>
+ <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="phone" property="phone"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="mark_paper_status" property="markPaperStatus" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
+ </resultMap>
+
<select id="getById" resultMap="BaseResultMap">
SELECT TCU.classes_id,
@@ -26,16 +38,41 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT TCU.classes_id,
- TCU.user_id,
- TCU.create_time,
- TCU.id,
- TU.real_name,
- TU.sex,
- TU.phone
+ TCU.user_id,
+ TCU.create_time,
+ TCU.id,
+ TU.real_name,
+ TU.sex,
+ TU.phone
FROM t_classes_user TCU
- LEFT JOIN t_user TU ON TU.id = TCU.user_id
+ LEFT JOIN t_user TU ON TU.id = TCU.user_id
WHERE TCU.deleted = 0
- <if test="query.studentName != null and query.studentName != ''">AND TU.real_name like concat('%', #{query.studentName}, '%')</if>
+ <if test="query.studentName != null and query.studentName != ''">AND TU.real_name like concat('%',
+ #{query.studentName}, '%')
+ </if>
</select>
+
+ <select id="getClassesUserList" resultMap="ResultMap">
+ SELECT
+ TU.id,
+ TU.real_name,
+ TU.phone,
+ EST.do_time,
+ EST.status,
+ 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}
+ LEFT JOIN t_exam_submit_temp EST ON EST.user_id = TU.id
+ WHERE
+ 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>
--
Gitblit v1.8.0