1、乐团课新增排课教师课酬计算逻辑调整

2、陪练课接口
3、陪练课指派教师广东分部特殊处理

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

@@ -469,6 +469,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 for (int j=0;j<teacherCourses.size()-1;j++) {
                     CourseSchedule preCourseSchedule = teacherCourses.get(j);
                     CourseSchedule backCourseSchedule = teacherCourses.get(j+1);
+                    if(preCourseSchedule.getEndClassTime().after(backCourseSchedule.getEndClassTime())){
+                        backCourseSchedule.setEndClassTime(preCourseSchedule.getEndClassTime());
+                    }
                     if(j==0){
                         for (Date enableApplyDate : enableApplyDates) {
                             Date enableApplyDateCourseEndTime = DateUtil.addMinutes(enableApplyDate, practiceCourseMinutes);
@@ -477,7 +480,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                             }
                         }
                     }
-                    if (j==teacherCourses.size()-1){
+                    if (j==teacherCourses.size()-2){
                         for (Date enableApplyDate : enableApplyDates) {
                             if(!enableApplyDate.before(backCourseSchedule.getEndClassTime())){
                                 allTeacherFreeDates.add(enableApplyDate);

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

@@ -2119,7 +2119,6 @@
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>
-        AND csts.group_type_!='PRACTICE'
         FOR UPDATE
     </select>
     <select id="findStudentPracticeCourses" resultMap="courseScheduleDto">