diff --git a/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserInfoData.java b/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserInfoData.java new file mode 100644 index 00000000..63b55dfc --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserInfoData.java @@ -0,0 +1,59 @@ +package com.ibeetl.jlw.entity.api.teacher; + +import com.ibeetl.admin.core.entity.BaseEntity; +import com.ibeetl.admin.core.entity.CoreUser; +import com.ibeetl.jlw.entity.Teacher; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.beetl.sql.fetch.annotation.Fetch; + +/** + * 教师端-首页实体 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Accessors(chain = true) +@Fetch(level = 2) +public class TeacherUserInfoData { + + private Teacher teacherInfo; + + private CoreUser userInfo; + + private TeacherRuleInfo ruleInfo; + + @Data + public static class TeacherRuleInfo extends BaseEntity { + + /** + * 教师姓名 + */ + private String teacherName; + /** + * 学校名称 + */ + private String universitiesCollegesName; + /** + * 学校所在省市 + */ + private String universitiesCollegesAddress; + /** + * 院系名称 + */ + private String universityFacultyName; + /** + * 专业名称 + */ + private String universitySystemName; + /** + * 班级名称,多个顿号隔开 + */ + private String classNames; + + } +} diff --git a/web/src/main/resources/sql/jlw/teacher.md b/web/src/main/resources/sql/jlw/teacher.md index f635294d..d16fd3c2 100644 --- a/web/src/main/resources/sql/jlw/teacher.md +++ b/web/src/main/resources/sql/jlw/teacher.md @@ -526,7 +526,7 @@ getTeacherUserInfoRuleInfo concat( td.universities_colleges_province, universities_colleges_city ) AS universities_colleges_address, ( SELECT - replace(GROUP_CONCAT(class_name), ',', '、') + GROUP_CONCAT(class_name separator '、') FROM school_class ab WHERE