zouxuan 5 年之前
父节点
当前提交
0b5945451c

+ 5 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -879,6 +879,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 break;
             case "PRACTICE":
                 teacherMusicClassGroup = classGroupDao.findTeacherPracticeClassGroup(user.getId().longValue());
+                //获取陪练课学生名称
                 break;
             default:
                 throw new BizException("课程类型错误");
@@ -909,7 +910,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         Map<Integer, Long> classGroupStudentNumMap = MapUtil.convertIntegerMap(classGroupStudentNumMaps);
         Map<Integer, Long> currentClassTimes = MapUtil.convertIntegerMap(courseScheduleDao.countCurrentNumByClassGroupId(classGroupIds,user.getId()));
         teacherMusicClassGroup.forEach(teacherClassGroupDto -> {
-
+            if(teacherClassGroupDto.getType() == ClassGroupTypeEnum.PRACTICE){
+                String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(teacherClassGroupDto.getClassGroupId());
+                teacherClassGroupDto.setStudentNames(StringUtils.join(studentNums, ","));
+            }
             if (teacherClassGroupDto.getType() == ClassGroupTypeEnum.VIP) {
                 String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(teacherClassGroupDto.getClassGroupId());
                 teacherClassGroupDto.setStudentNames(StringUtils.join(studentNums, ","));

+ 17 - 7
mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -454,13 +454,23 @@
     </select>
     <select id="findTeacherPracticeClassGroup" resultMap="TeacherClassGroupDto">
         SELECT
-        MIN(pg.name_) music_group_name_,COUNT(csts.id_) online_classes_num_,0 offline_classes_num_,
-        pg.id_ music_group_id_,MAX(pg.single_class_minutes_) single_class_minutes_,MIN(csts.class_group_id_) class_group_id_,'PRACTICE' type_,1 class_mode_,MAX(su.username_) student_names_
-        FROM practice_group pg
-        LEFT JOIN course_schedule_teacher_salary csts ON pg.id_ = csts.music_group_id_ AND csts.group_type_ = 'PRACTICE'
-        LEFT JOIN sys_user su ON  su.id_ = csts.user_id_
-        WHERE csts.user_id_ = #{teacherId}
-        GROUP BY pg.id_
+            cg.id_ class_group_id_,
+            cg.name_ class_group_name_,
+            cg.type_,
+            cg.subject_id_list_,
+            pg.courses_expire_date_,
+            pg.single_class_minutes_,
+            cg.total_class_times_ online_classes_num_,
+						0 offline_classes_num_,
+            cg.total_class_times_,
+            pg.id_ music_group_id_,
+            pg.name_ music_group_name_,
+						1 class_mode_
+        FROM
+            practice_group pg
+            LEFT JOIN class_group cg ON pg.id_=cg.music_group_id_ AND cg.group_type_='PRACTICE'
+        WHERE
+            pg.user_id_ = #{teacherId} AND cg.del_flag_ = 0
     </select>
     <select id="findTeacherVipClassGroup" resultMap="TeacherClassGroupDto">
         SELECT