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

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

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

@@ -685,7 +685,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             String[] courseNames=new String[courseSchedules1.size()];
             for (int i=0;i<courseSchedules1.size();i++) {
                 if(courseSchedules1.get(i).getGroupType().equals(GroupType.PRACTICE)){
-                    throw new BizException("指派的老师在预约的时间段内存在陪练课");
+                    if(courseSchedules1.get(i).getMusicGroupId().equals(practiceGroup.getId().toString())) {
+                        throw new BizException("指派的老师在预约的时间段内存在陪练课");
+                    }else{
+                        continue;
+                    }
                 }
                 courseDates[i]=DateUtil.dateToString(courseSchedules1.get(i).getStartClassTime(),"yyyy-MM-dd HH:mm:ss");
                 courseNames[i]=courseSchedules1.get(i).getName();

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -46,7 +46,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @ApiOperation(value = "根据月份获取该月有课的日期")
     @GetMapping("/getCourseScheduleDateByMonth")
     public Object getCourseScheduleDateByMonth(@ApiParam(value = "月份", required = true) @RequestParam Date month,
-                                               @ApiParam(value = "课程类型", required = false) String type) {
+                                               @ApiParam(value = "课程类型") String type) {
         if(Objects.isNull(month)){
             return failed(HttpStatus.FORBIDDEN, "请指定日期!");
         }