From 83953fac1e778b6de84efaa09bc6913fed2e0b12 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 29 十月 2024 16:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/MeetMapper.xml | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/MeetMapper.xml b/src/main/resources/mapper/MeetMapper.xml
index aeef8be..d682cb3 100644
--- a/src/main/resources/mapper/MeetMapper.xml
+++ b/src/main/resources/mapper/MeetMapper.xml
@@ -13,6 +13,19 @@
<result column="status" property="status" />
</resultMap>
+ <resultMap id="PageMap" type="com.ycl.jxkg.domain.vo.MeetVO">
+ <result column="meet_name" property="meetName" />
+ <result column="meet_cover" property="meetCover" />
+ <result column="classes_id" property="classesId" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="status" property="status" />
+ <collection property="teacherNames" ofType="string" column="classes_id" select="getTeacherNames"></collection>
+ </resultMap>
+
+ <select id="getTeacherNames" resultType="string">
+ SELECT tu.real_name FROM t_user tu INNER JOIN t_classes_user tcu ON tu.id = tcu.user_id AND tcu.classes_id = #{classesId} AND tcu.teacher = 1
+ </select>
<select id="getById" resultMap="BaseResultMap">
SELECT
@@ -31,7 +44,7 @@
</select>
- <select id="getPage" resultMap="BaseResultMap">
+ <select id="getPage" resultMap="PageMap">
SELECT
TM.meet_name,
TM.meet_cover,
@@ -44,7 +57,7 @@
FROM
t_meet TM
<where>
- TM.deleted = 0 and TC.deleted = 0
+ TM.deleted = 0
<if test="query.classesIds !=null">
and classes_id in
<foreach collection="query.classesIds" item="classesId" open="(" close=")" separator=",">
@@ -52,9 +65,26 @@
</foreach>
</if>
<if test="query.teacherId!=null">
- and create_user = #{query.teacherId}
+ and TM.create_user = #{query.teacherId}
+ </if>
+ <if test="query.status!=null">
+ and TM.status = #{query.status}
+ </if>
+ <if test="query.meetName !=null and query.meetName!='' ">
+ and TM.meet_name like concat ('%',#{query.meetName},'%')
</if>
</where>
</select>
+ <select id="getStudentList" resultType="com.ycl.jxkg.domain.vo.StudentSimpleVO">
+ SELECT
+ s.real_name, s.id
+ FROM
+ t_meet m
+ INNER JOIN t_classes c ON m.classes_id = c.id AND m.id = #{meetId} AND c.deleted = 0 AND m.deleted = 0
+ INNER JOIN t_classes_user cu ON cu.classes_id = c.id AND cu.deleted = 0
+ INNER JOIN t_user s ON s.id = cu.user_id AND s.deleted = 0
+ <if test="keyword != null and keyword != ''">AND s.real_name like concat('%', #{keyword}, '%')</if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0