乐团档案

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

@@ -421,7 +421,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param userId
      * @return
      */
-    List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId);
+    List<StudentMusicGroupDto> queryStudentMusicGroupInfo(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取学员剩余课程费用

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

@@ -352,7 +352,7 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
      * @param userId
      * @return
      */
-    List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId);
+    List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId,String musicGroupId);
 
 
     /**

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

@@ -1799,8 +1799,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-    public List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId) {
-        return studentRegistrationDao.queryStudentMusicGroupInfo(userId);
+    public List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId,String musicGroupId) {
+        return studentRegistrationDao.queryStudentMusicGroupInfo(userId,musicGroupId);
     }
 
     @Override

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

@@ -1115,6 +1115,9 @@
         ON mgq.music_group_id_ = sr.music_group_id_
         AND mgq.user_id_ = sr.user_id_ AND mgq.join_date_ = sr.create_time_
         where sr.user_id_ = #{userId}
+        <if test="musicGroupId != null and musicGroupId != ''">
+            AND sr.music_group_id_ = #{musicGroupId}
+        </if>
         order by sr.id_
     </select>
 

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -111,12 +111,12 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation("获取学生所在乐团列表")
     @GetMapping(value = "/queryStudentMusicGroupInfo")
-    public Object queryStudentMusicGroupInfo() {
+    public Object queryStudentMusicGroupInfo(String musicGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(studentRegistrationService.queryStudentMusicGroupInfo(sysUser.getId()));
+        return succeed(studentRegistrationService.queryStudentMusicGroupInfo(sysUser.getId(),musicGroupId));
     }
 
     @ApiOperation("获取学生个人中心乐团信息")

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupDetailController.java

@@ -82,7 +82,7 @@ public class MusicGroupDetailController extends BaseController {
     }
 
     @ApiOperation(value = "查询学员班级列表")
-    @GetMapping("/queryStudentAndTeacher")
+    @GetMapping("queryStudentAndTeacher")
     public Object queryStudentClassGroupsAndTeacher(String musicGroupId) {
         return succeed(classGroupService.queryStudentClassGroupsAndTeacher(musicGroupId));
     }