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

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

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

@@ -77,6 +77,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     private static final Set<Integer> GUANGZHOU_SUBJECTIDS=new HashSet<Integer>(Arrays.asList(new Integer[]{2,4,5,12,13,15,23}));
     //广州分部编号
     private static final Integer GUANGZHOU_ORGAN_ID=3;
+    //大连分部编号
+    private static final Integer DALIAN_ORGAN_ID=27;
+    //沈阳分部编号
+    private static final Integer SHENYANG_ORGAN_ID=6;
 
     private static Map<Integer,String> subjectSubjectsMap=new HashMap<>();
 
@@ -168,6 +172,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             if(Objects.nonNull(teacherId)){
                 return teacherId;
             }
+        }else if(sysUser.getOrganId().equals(DALIAN_ORGAN_ID)){
+            sysUser.setOrganId(SHENYANG_ORGAN_ID);
         }
 
         List<TeacherBasicDto> organAndSubjectTeachers = teacherDao.findTeaTeachersByOrganAndSubject(sysUser.getOrganId(), subjectSubjectsMap.get(practiceGroup.getSubjectId()));
@@ -565,7 +571,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     teacherIds = schoolSubjectTeachersMap.get(schoolId).get(subjectId);
                 }
             }
+        }else if(sysUser.getOrganId().equals(DALIAN_ORGAN_ID)){
+            sysUser.setOrganId(SHENYANG_ORGAN_ID);
         }
+
         if(CollectionUtils.isEmpty(teacherIds)){
             List<TeacherBasicDto> organAndSubjectTeachers = teacherDao.findTeaTeachersByOrganAndSubject(sysUser.getOrganId(), subjectSubjectsMap.get(subjectId));
             if (CollectionUtils.isEmpty(organAndSubjectTeachers)) {
@@ -671,7 +680,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     }
                 }
 
-                teacherCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
+                if(CollectionUtils.isEmpty(applyDateRangeCourses)){
+                    allTeacherFreeDates=new HashSet<>(tempEnableApplyDates);
+                    break;
+                }
+
+                applyDateRangeCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
                 for (int j=0;j<applyDateRangeCourses.size()-1;j++) {
                     CourseSchedule preCourseSchedule = applyDateRangeCourses.get(j);
                     CourseSchedule backCourseSchedule = applyDateRangeCourses.get(j+1);

mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -68,7 +68,7 @@ public class PracticeGroupController extends BaseController {
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        if("36".equals(sysUser.getOrganId())){
+        if(36==sysUser.getOrganId()){
             throw new BizException("暂无预约资格");
         }
         practiceGroup.setStudentId(sysUser.getId());