update

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

@@ -477,4 +477,19 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @return
 	 */
 	int getHasTeacherSalaryCount(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+
+	/**
+	 * 根据助教主教获取教师列表
+	 * @param classGroupId
+	 * @param teacherRole
+	 * @return
+	 */
+    List<Integer> queryTeacherByTeaching(@Param("classGroupId") Integer classGroupId, @Param("teacherRole") String teacherRole);
+
+	/**
+	 * 根据助教主教获取教师列表
+	 * @param classGroupId
+	 * @return
+	 */
+    Integer queryTeacherByBishop(@Param("classGroupId") Integer classGroupId);
 }

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

@@ -4254,8 +4254,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<Integer> teachingTeacherIdList = new ArrayList<Integer>();
 		teachingTeacherIdList.add(targetTeacherId);
 		List<CourseSchedule> courseSchedules = this.queryNoStartCourseByTeacherId(classGroupIds,teacherId,"BISHOP");
+		//获取助教老师列表
 		if(courseSchedules.size() > 0){
 			courseSchedules.forEach(e->{
+				e.setTeachingTeacherIdList(courseScheduleTeacherSalaryDao.queryTeacherByTeaching(e.getClassGroupId()));
 				e.setActualTeacherId(targetTeacherId);
 			});
 			this.courseAdjust(courseSchedules);
@@ -4267,6 +4269,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<CourseSchedule> courseSchedules1 = this.queryNoStartCourseByTeacherId(classGroupIds, teacherId, "TEACHING");
 		if(courseSchedules1.size() > 0){
 			courseSchedules1.forEach(e->{
+				e.setActualTeacherId(courseScheduleTeacherSalaryDao.queryTeacherByBishop(e.getClassGroupId()));
 				e.setTeachingTeacherIdList(teachingTeacherIdList);
 			});
 			this.courseAdjust(courseSchedules1);

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

@@ -960,4 +960,12 @@
 			#{courseScheduleId}
 		</foreach>
 	</select>
+    <select id="queryTeacherByTeaching" resultType="java.lang.Integer">
+		SELECT DISTINCT cgtm.user_id_ FROM class_group_teacher_mapper cgtm
+		WHERE cgtm.class_group_id_ = #{classGroupId} AND cgtm.teacher_role_ = 'TEACHING' AND cgtm.group_type_ = 'MUSIC';
+	</select>
+    <select id="queryTeacherByBishop" resultType="java.lang.Integer">
+		SELECT DISTINCT cgtm.user_id_ FROM class_group_teacher_mapper cgtm
+		WHERE cgtm.class_group_id_ = #{classGroupId} AND cgtm.teacher_role_ = 'BISHOP' AND cgtm.group_type_ = 'MUSIC';
+	</select>
 </mapper>