Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupStudentMapperDao.java

@@ -371,4 +371,11 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
                                                     @Param("groupType") GroupType groupType,
                                                     @Param("userId") Integer userId,
                                                     @Param("status") ClassGroupStudentStatusEnum status);
+
+    /**
+     * 获取学员教务老师
+     * @param studentIds
+     * @return
+     */
+    List<Map<Integer, Integer>> getStudentEducationalTeachers(@Param("studentIds") List<Integer> studentIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OnlineMusicGroupServiceImpl.java

@@ -377,7 +377,7 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
         LocalDate endDay = startDay.plusDays(14);
 
         Map<Integer, List<String>> weekNumApplyTimesMap = eduPracticeGroupService.getEnableApplyDatesWithWeek(startDay.getDayOfWeek().getValue());
-        List<CourseSchedule> allTeacherCourses = courseScheduleDao.findTeacherCoursesWithDateRangeWithoutMusicGroup(teacherId, Date.from(startDay.atStartOfDay(zoneId).toInstant()), Date.from(endDay.atStartOfDay(zoneId).toInstant()));
+        List<CourseSchedule> allTeacherCourses = courseScheduleDao.findTeacherCoursesWithDateRange(teacherId, Date.from(startDay.atStartOfDay(zoneId).toInstant()), Date.from(endDay.atStartOfDay(zoneId).toInstant()));
         allTeacherCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
 
         JSONObject teacherLeaveData = null;

mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -454,4 +454,20 @@
             </if>
         </where>
     </select>
+    <select id="getStudentEducationalTeachers" resultType="java.util.Map">
+        SELECT t.user_id_ AS 'key',MAX(t.educational_teacher_id_) AS 'value'
+        FROM (
+        SELECT cgsm.user_id_, g.educational_teacher_id_ FROM class_group_student_mapper cgsm
+        LEFT JOIN music_group g ON cgsm.music_group_id_=g.id_
+        WHERE cgsm.group_type_='MUSIC'
+        UNION ALL
+        SELECT cgsm.user_id_, g.educational_teacher_id_ FROM class_group_student_mapper cgsm
+        LEFT JOIN vip_group g ON cgsm.music_group_id_=g.id_
+        WHERE cgsm.group_type_='VIP'
+        UNION ALL
+        SELECT cgsm.user_id_, g.educational_teacher_id_ FROM class_group_student_mapper cgsm
+        LEFT JOIN practice_group g ON cgsm.music_group_id_=g.id_
+        WHERE cgsm.group_type_='PRACTICE'
+        ) t GROUP BY t.user_id_
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2465,6 +2465,7 @@
           AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") AND DATE_FORMAT(#{endTime}, "%Y-%m-%d")
           AND csts.user_id_ = #{userId}
     </select>
+
     <select id="findStudentPracticeCourses" resultMap="courseScheduleDto">
         SELECT cs.id_                                            seal_class_id_,
                cs.type_,
@@ -2648,7 +2649,7 @@
         AND cgtm.`teacher_role_` = 'BISHOP'
         LEFT JOIN `course_schedule` cs ON cs.`class_group_id_` = cg.`id_`
         WHERE
-        cgsm.user_id_=#{userId}
+        cgsm.user_id_=#{studentId}
         AND cgtm.teacher_role_='BISHOP'
         AND cgsm.status_ = 'NORMAL'
         AND cg.group_type_ IN ( 'PRACTICE', 'MUSIC', 'VIP' )