From 7457e3aa4f2e0f640a08b35f47de1eabd555d7bf Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 05 六月 2024 17:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ClassesMapper.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/ClassesMapper.xml b/src/main/resources/mapper/ClassesMapper.xml
index 9ab8cd1..95bd72e 100644
--- a/src/main/resources/mapper/ClassesMapper.xml
+++ b/src/main/resources/mapper/ClassesMapper.xml
@@ -6,10 +6,16 @@
<resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.vo.ClassesVO">
<result column="class_name" property="className" />
<result column="create_user" property="createUser" />
+ <result column="real_name" property="createUserName" />
+ <result column="phone" property="teacherPhone" />
<result column="create_time" property="createTime" />
<result column="classes_number" property="classesNumber" />
- <result column="status" property="status" />
+ <result column="status" property="status" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
<result column="verify_status" property="verifyStatus" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="remark" property="remark" />
+ <result column="create_time" property="createTime" />
</resultMap>
@@ -26,6 +32,10 @@
TC.classes_number,
TC.status,
TC.verify_status,
+ TC.start_time,
+ TC.end_time,
+ TC.remark,
+ TC.create_time,
TC.id
FROM
t_classes TC
@@ -41,10 +51,17 @@
TC.create_time,
TC.classes_number,
TC.status,
+ TC.create_time,
TC.verify_status,
- TC.id
+ TC.start_time,
+ TC.end_time,
+ TC.remark,
+ TC.id,
+ TU.real_name,
+ TU.phone
FROM
t_classes TC
+ LEFT JOIN t_user TU ON TU.id = TC.create_user AND TU.deleted = 0
WHERE
TC.deleted = 0
</select>
--
Gitblit v1.8.0