Merge branch 'adapay_new'

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

@@ -185,7 +185,8 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @param courseScheduleId
 	 * @return
 	 */
-	List<CourseScheduleTeachersDto> queryTeacherSalary(Long courseScheduleId);
+	List<CourseScheduleTeachersDto> queryTeacherSalary(@Param("courseScheduleId") Long courseScheduleId,
+													   @Param("teacherId") Integer teacherId);
 
 	/**
 	 * @param courseScheduleIds: 课程编号列表

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -211,7 +211,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param courseScheduleId
 	 * @return
 	 */
-	List<CourseScheduleTeachersDto> queryTeacherSalary(Long courseScheduleId);
+	List<CourseScheduleTeachersDto> queryTeacherSalary(Long courseScheduleId,Integer teacherId);
 
 	/**
 	 * 开启缴费（报名中 -->  缴费中）
@@ -306,4 +306,4 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param musicGroupIds
 	 */
 //	void musicGroupStudentFeePatch(List<String> musicGroupIds);
-}
+}

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

@@ -2335,8 +2335,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    public List<CourseScheduleTeachersDto> queryTeacherSalary(Long courseScheduleId) {
-        return courseScheduleTeacherSalaryDao.queryTeacherSalary(courseScheduleId);
+    public List<CourseScheduleTeachersDto> queryTeacherSalary(Long courseScheduleId,Integer teacherId) {
+        return courseScheduleTeacherSalaryDao.queryTeacherSalary(courseScheduleId, teacherId);
     }
 
     @Override

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

@@ -380,6 +380,9 @@
 		FROM course_schedule_teacher_salary csts
 		LEFT JOIN sys_user su ON su.id_ = csts.user_id_
 		WHERE csts.course_schedule_id_ = #{courseScheduleId}
+			<if test="teacherId!=null">
+				AND csts.user_id_ = #{teacherId}
+			</if>
 	</select>
 	<select id="findByCourseSchedules" resultMap="CourseScheduleTeacherSalary">
 		SELECT * FROM  course_schedule_teacher_salary WHERE course_schedule_id_ IN

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -275,8 +275,8 @@ public class CourseScheduleController extends BaseController {
 	@ApiOperation(value = "乐团详情--课酬调整--课程教师列表")
 	@GetMapping("/queryTeacherSalary")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/queryTeacherSalary')")
-	public Object queryTeacherSalary(Long courseScheduleId) {
-		return succeed(musicGroupService.queryTeacherSalary(courseScheduleId));
+	public Object queryTeacherSalary(Long courseScheduleId,Integer teacherId) {
+		return succeed(musicGroupService.queryTeacherSalary(courseScheduleId,teacherId));
 	}
 
     @ApiOperation(value = "根据班级获取课程计划")