From b7273d6fc94ae5e14f5a911d8b8b88cb7c848264 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 30 十月 2024 20:14:10 +0800
Subject: [PATCH] 学员bug
---
src/main/resources/mapper/MeetMapper.xml | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/MeetMapper.xml b/src/main/resources/mapper/MeetMapper.xml
index 78d3306..6b9185f 100644
--- a/src/main/resources/mapper/MeetMapper.xml
+++ b/src/main/resources/mapper/MeetMapper.xml
@@ -14,17 +14,17 @@
</resultMap>
<resultMap id="PageMap" type="com.ycl.jxkg.domain.vo.MeetVO">
+ <id column="id" property="id"/>
<result column="meet_name" property="meetName" />
<result column="meet_cover" property="meetCover" />
<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>
- <collection property="classesIds" ofType="string" column="classes_id" select="getTeacherNames"></collection>
+ <collection property="classesIds" ofType="int" column="id" select="getClassesIds"></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 id="getClassesIds" resultType="int">
+ SELECT tmc.classes_id FROM t_meet_classes tmc WHERE tmc.meet_id = #{id}
</select>
<select id="getById" resultMap="BaseResultMap">
@@ -44,7 +44,7 @@
</select>
- <select id="getPage" resultMap="PageMap">
+ <select id="teacherPage" resultMap="PageMap">
SELECT
TM.meet_name,
TM.meet_cover,
@@ -55,16 +55,16 @@
TM.id
FROM
t_meet TM
+ <if test="query.classesIds !=null and query.classesIds.size > 0">
+ INNER JOIN t_meet_classes TMC ON TM.id = TMC.meet_id
+ </if>
<where>
TM.deleted = 0
- <if test="query.classesIds !=null">
- and classes_id in
+ <if test="query.classesIds !=null and query.classesIds.size > 0">
+ and TMC.classes_id in
<foreach collection="query.classesIds" item="classesId" open="(" close=")" separator=",">
#{classesId}
</foreach>
- </if>
- <if test="query.teacherId!=null">
- and TM.create_user = #{query.teacherId}
</if>
<if test="query.status!=null">
and TM.status = #{query.status}
@@ -73,6 +73,39 @@
and TM.meet_name like concat ('%',#{query.meetName},'%')
</if>
</where>
+ order by TM.end_time desc
+ </select>
+
+ <select id="studentPage" resultMap="PageMap">
+ SELECT
+ TM.meet_name,
+ TM.meet_cover,
+ TM.create_user,
+ TM.start_time,
+ TM.end_time,
+ TM.status,
+ TM.id
+ FROM
+ t_meet TM
+ <if test="query.classesIds !=null and query.classesIds.size > 0">
+ INNER JOIN t_meet_classes TMC ON TM.id = TMC.meet_id
+ </if>
+ <where>
+ TM.deleted = 0
+ <if test="query.classesIds !=null and query.classesIds.size > 0">
+ and TMC.classes_id in
+ <foreach collection="query.classesIds" item="classesId" open="(" close=")" separator=",">
+ #{classesId}
+ </foreach>
+ </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>
+ order by TM.end_time desc
</select>
<select id="getStudentList" resultType="com.ycl.jxkg.domain.vo.StudentSimpleVO">
--
Gitblit v1.8.0