From f4b755d2a666d147894face9c935204a8cb5fd49 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Tue, 25 Oct 2022 17:26:40 +0800
Subject: [PATCH] 123

---
 .../ibeetl/jlw/entity/TeacherOpenCourse.java  | 24 ++++++++++++++++++-
 web/src/main/resources/application.properties |  2 +-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java
index 22e2a03f..819d4847 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java
@@ -48,18 +48,32 @@ public class TeacherOpenCourse extends BaseEntity{
 
     private Integer teacherOpenCourseStatus ;
 
-    @FetchSql("select t.teacher_id, teacher_open_course_merge_teacher_auth_code from teacher_open_course_merge_teacher t " +
+    @FetchSql("select t.teacher_id, ta.teacher_name, teacher_open_course_merge_teacher_auth_code from teacher_open_course_merge_teacher t " +
+            "left join teacher ta on ta.teacher_id = t.teacher_id " +
             "where t.teacher_open_course_id = #teacherOpenCourseId# and t.teacher_open_course_merge_teacher_status = 1 " +
             "order by teacher_id limit 1 ")
     private MergeTeacherInfo teacherInfo;
 
+    @FetchSql("select GROUP_CONCAT(ta.class_name) from teacher_open_course_merge_school_class t  " +
+            "left join school_class ta on t.school_class_id = ta.class_id " +
+            "where  t.teacher_open_course_merge_school_class_status = 1 and t.teacher_open_course_id = #teacherOpenCourseId# ")
+    private String schoolClassInfo;
+
     @Setter
     @Getter
     @Accessors(chain = true)
     public static class MergeTeacherInfo {
         private Long teacherId;
+        private String teacherName;
         private String teacherOpenCourseMergeTeacherAuthCode;
     }
+    @Setter
+    @Getter
+    @Accessors(chain = true)
+    public static class MergeSchoolClassInfo {
+        private String schoolClassIds;
+        private String schoolClassName;
+    }
 
     //开课时间
 
@@ -229,4 +243,12 @@ public class TeacherOpenCourse extends BaseEntity{
     public MergeTeacherInfo getTeacherInfo() {
         return teacherInfo;
     }
+
+    public String getSchoolClassInfo() {
+        return schoolClassInfo;
+    }
+
+    public void setSchoolClassInfo(String schoolClassInfo) {
+        this.schoolClassInfo = schoolClassInfo;
+    }
 }
diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties
index 11019ea7..0593349a 100644
--- a/web/src/main/resources/application.properties
+++ b/web/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.profiles.active=prod
+spring.profiles.active=dev
 #spring.profiles.active=local
 
 m3u8.ffmpegPath=D:/