From ade2140f7950c36b401d434e025bf0b677f2673c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 六月 2024 17:47:25 +0800
Subject: [PATCH] 班级字段调整，相应类调整
---
src/main/resources/mapper/ClassesMapper.xml | 10 +++++++++-
src/main/java/com/ycl/jxkg/domain/entity/Classes.java | 9 ++++++---
src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java | 6 ++++++
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
index bdb9f0c..d35218c 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
@@ -6,6 +6,8 @@
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;
+import java.util.Date;
+
/**
* 鐝骇
*
@@ -40,15 +42,16 @@
@TableField("start_time")
/** 寮�濮嬫椂闂� */
- private String startTime;
+ private Date startTime;
@TableField("end_time")
/** 缁撴潫鏃堕棿 */
- private String endTime;
+ private Date endTime;
@TableField("remark")
/** 澶囨敞 */
private String remark;
-
+ @TableField("create_time")
+ private Date createTime;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
index f855e9c..ea5b6c6 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
@@ -1,5 +1,6 @@
package com.ycl.jxkg.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.jxkg.domain.base.AbsVo;
import com.ycl.jxkg.domain.entity.Classes;
@@ -26,8 +27,11 @@
/** 鍒涘缓浜� */
private Integer createUser;
+ private String createUserName;
+ private String teacherPhone;
/** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 鐝骇浜烘暟 */
@@ -40,9 +44,11 @@
private String verifyStatus;
/** 寮�濮嬫椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/** 缁撴潫鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
/** 澶囨敞 */
diff --git a/src/main/resources/mapper/ClassesMapper.xml b/src/main/resources/mapper/ClassesMapper.xml
index 8c8ea9c..2b6455b 100644
--- a/src/main/resources/mapper/ClassesMapper.xml
+++ b/src/main/resources/mapper/ClassesMapper.xml
@@ -6,6 +6,8 @@
<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" />
@@ -13,6 +15,7 @@
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
<result column="remark" property="remark" />
+ <result column="create_time" property="createTime" />
</resultMap>
@@ -32,6 +35,7 @@
TC.start_time,
TC.end_time,
TC.remark,
+ TC.create_time,
TC.id
FROM
t_classes TC
@@ -47,13 +51,17 @@
TC.create_time,
TC.classes_number,
TC.status,
+ TC.create_time,
TC.verify_status,
TC.start_time,
TC.end_time,
TC.remark,
- TC.id
+ 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