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

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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -75,7 +75,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     List<TeacherBasicDto> findTeachers(@Param("userIds") List<Integer> userIds);
 
     /**
-     * @describe 获取指定声部和分部下的老师
+     * @describe 获取指定声部和分部下的全职老师
      * @author Joburgess
      * @date 2020/2/2
      * @param organId: 分部编号

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

@@ -381,7 +381,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
-        for (int i=0;calendar.getTime().before(activityEndDate);i++){
+        while (calendar.getTime().before(activityEndDate)){
             calendar.add(Calendar.DATE,1);
             Date applyStartDay = calendar.getTime();
             calendar.add(Calendar.DATE,7);
@@ -395,8 +395,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             if(Objects.nonNull(firstClassTime)){
                 Date firstClassEndTime = DateUtil.addMinutes(firstClassTime, practiceCourseMinutes);
                 for (CourseSchedule teacherCourse : allTeacherCourses) {
-                    if((!teacherCourse.getStartClassTime().before(firstClassTime)&&!teacherCourse.getStartClassTime().after(firstClassEndTime))
-                            ||(!teacherCourse.getEndClassTime().before(firstClassTime)&&!teacherCourse.getEndClassTime().after(firstClassEndTime))){
+                    if(firstClassTime.before(teacherCourse.getEndClassTime())
+                        &&firstClassEndTime.after(teacherCourse.getStartClassTime())){
                         excludeTeacherIds.add(teacherCourse.getActualTeacherId());
                     }
                 }

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

@@ -302,6 +302,7 @@
         WHERE
             INTE_ARRAY(#{subjectIds},t.subject_id_)
             AND (t.organ_id_=#{organId} OR FIND_IN_SET(#{organId},t.flow_organ_range_))
+            AND t.job_nature_='FULL_TIME'
     </select>
     <select id="findTeacherByOrganAndSubject" resultMap="TeacherBasicDto">
         SELECT