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

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

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

@@ -85,12 +85,13 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
     private static Map<Integer, String> subjectSubjectsMap = new HashMap<>();
 
-    private static Date activityStartDate, activityEndDate, applyStartDay;
+    private static Date activityStartDate, activityEndDate, applyStartDay, courseExpireDate;
 
     static {
         applyStartDay = DateUtil.stringToDate("2020-02-08 00:00:00");
         activityStartDate = DateUtil.stringToDate("2020-02-09 00:00:00");
         activityEndDate = DateUtil.stringToDate("2020-03-25 00:00:00");
+        courseExpireDate = DateUtil.stringToDate("2020-04-01 00:00:00");
 
         schoolSubjectTeachersMap = new HashMap<>();
         Map<Integer, List<Integer>> subjectTeachersMap1 = new HashMap<>();
@@ -833,12 +834,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             allCourseDates.add(DateUtil.addDays(tempDate, 7));
         }
         if (allCourseDates.get(2).before(activityStartDate)
-                || allCourseDates.get(2).after(activityEndDate)) {
+                || allCourseDates.get(2).after(courseExpireDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
             return result;
         }
         if (allCourseDates.get(3).before(activityStartDate)
-                || allCourseDates.get(3).after(activityEndDate)) {
+                || allCourseDates.get(3).after(courseExpireDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
             return result;
         }