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

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

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

@@ -694,6 +694,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     }
                     if(j==0){
                         for (Date enableApplyDate : tempEnableApplyDates) {
+                            if(Objects.nonNull(firstClassTime)&&DateUtil.isSameDay(enableApplyDate,firstClassTime)){
+                                continue;
+                            }
                             Date enableApplyDateCourseEndTime = DateUtil.addMinutes(enableApplyDate, practiceCourseMinutes);
                             if(!enableApplyDateCourseEndTime.after(preCourseSchedule.getStartClassTime())){
                                 allTeacherFreeDates.add(enableApplyDate);
@@ -702,12 +705,18 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     }
                     if (j==applyDateRangeCourses.size()-2){
                         for (Date enableApplyDate : tempEnableApplyDates) {
+                            if(Objects.nonNull(firstClassTime)&&DateUtil.isSameDay(enableApplyDate,firstClassTime)){
+                                continue;
+                            }
                             if(!enableApplyDate.before(backCourseSchedule.getEndClassTime())){
                                 allTeacherFreeDates.add(enableApplyDate);
                             }
                         }
                     }
                     for (Date enableApplyDate : tempEnableApplyDates) {
+                        if(Objects.nonNull(firstClassTime)&&DateUtil.isSameDay(enableApplyDate,firstClassTime)){
+                            continue;
+                        }
                         Date enableApplyDateCourseEndTime = DateUtil.addMinutes(enableApplyDate, practiceCourseMinutes);
                         if(!enableApplyDate.before(preCourseSchedule.getEndClassTime())
                                 &&!enableApplyDateCourseEndTime.after(backCourseSchedule.getStartClassTime())){

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

@@ -2115,7 +2115,9 @@
         FROM
             course_schedule_teacher_salary csts
             LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        WHERE cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},"%Y-%m-%d") AND DATE_FORMAT(#{endTime},"%Y-%m-%d")
+        WHERE
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},"%Y-%m-%d") AND DATE_FORMAT(#{endTime},"%Y-%m-%d")
         AND csts.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
@@ -2172,7 +2174,8 @@
             course_schedule_teacher_salary csts
             LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
         WHERE
-            csts.user_id_ = #{userId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND csts.user_id_ = #{userId}
             AND #{startTime} &lt; CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) AND #{endTime} &gt; CONCAT( cs.class_date_, ' ', cs.start_class_time_ )
     </select>
     <select id="findStudentCoursesWithIncludeDateRange" resultMap="CourseSchedule">
@@ -2202,7 +2205,8 @@
             course_schedule_student_payment cssp
             LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
         WHERE
-            cssp.user_id_ = #{userId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND cssp.user_id_ = #{userId}
             AND #{startTime} &lt; CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) AND #{endTime} &gt; CONCAT( cs.class_date_, ' ', cs.start_class_time_ );
     </select>
     <select id="queryContinueCourse" resultMap="CourseSchedule">