Merge remote-tracking branch 'origin/master'

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

@@ -464,14 +464,4 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
                                                @Param("monday") String monday,
                                                @Param("groupId") String groupId,
                                                @Param("courseType")CourseSchedule.CourseScheduleType courseType);
-
-    /**
-     * @describe 获取学员班级主教关联记录
-     * @author Joburgess
-     * @date 2021/1/25 0025
-     * @param studentIds:
-     * @return java.util.List<com.ym.mec.biz.dal.dto.BaseMapDto>
-     */
-    List<BaseMapDto<Integer, Integer>> getStudentClassGroupBishopTeacherMap(@Param("studentIds") List<Integer> studentIds,
-                                                                            @Param("musicGroupId") String musicGroupId);
 }

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

@@ -711,29 +711,4 @@
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_
 		WHERE cs.new_course_id_=#{mainMergeCourseId}
 	</select>
-    <select id="getStudentClassGroupBishopTeacherMap" resultType="com.ym.mec.biz.dal.dto.BaseMapDto">
-		SELECT
-			cssp.user_id_ 'key',
-			cgtm.user_id_ 'value'
-		FROM
-			course_schedule_student_payment cssp
-			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-			LEFT JOIN class_group_teacher_mapper cgtm ON cssp.class_group_id_ = cgtm.class_group_id_
-			LEFT JOIN class_group_student_mapper cgsm ON cssp.class_group_id_=cgsm.class_group_id_ AND cssp.user_id_=cgsm.user_id_
-		WHERE
-			( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
-			AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
-			AND cs.type_ IN ( 'SINGLE', 'TRAINING_SINGLE' )
-			AND cgtm.teacher_role_ = 'BISHOP'
-			AND cgsm.status_='NORMAL'
-			<if test="musicGroupId!=null and musicGroupId!=''">
-				AND cssp.music_group_id_ = #{musicGroupId}
-			</if>
-		  	<if test="studentIds!=null and studentIds.size()>0">
-				AND cssp.user_id_ IN
-				<foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
-					#{studentId}
-				</foreach>
-			</if>
-	</select>
 </mapper>

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

@@ -707,7 +707,8 @@
     </select>
 
     <select id="getUserGroups" resultMap="UserGroupDto">
-        SELECT DISTINCT sr.user_id_, mg.id_ group_id_, mg.name_ group_name_ FROM student_registration sr
+        SELECT DISTINCT sr.user_id_, mg.id_ group_id_, mg.name_ group_name_
+        FROM student_registration sr
         LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
         WHERE sr.payment_status_=2 AND sr.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">