增加删除班级学生接口

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

@@ -124,7 +124,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param actualSubjectId
      * @return
      */
-    List<StudentRegistration> findMusicGroupStudent(@Param("musicGroupId") String musicGroupId, @Param("actualSubjectId") Integer actualSubjectId);
+    List<StudentRegistration> findMusicGroupNoClassGroupStudent(@Param("musicGroupId") String musicGroupId, @Param("actualSubjectId") Integer actualSubjectId);
 
     /**
      * 批量调剂学生专业

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

@@ -156,7 +156,7 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 * @param actualSubjectId 科目id
 	 * @return
 	 */
-	List<StudentRegistration> getMusicGroupStu(String musicGroupId, Integer actualSubjectId);
+	List<StudentRegistration> findMusicGroupNoClassGroupStudent(String musicGroupId, Integer actualSubjectId);
 
 	/**
 	 * 根据id list 查询报名学生

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

@@ -465,8 +465,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-    public List<StudentRegistration> getMusicGroupStu(String musicGroupId, Integer actualSubjectId) {
-        return studentRegistrationDao.findMusicGroupStudent(musicGroupId, actualSubjectId);
+    public List<StudentRegistration> findMusicGroupNoClassGroupStudent(String musicGroupId, Integer actualSubjectId) {
+        return studentRegistrationDao.findMusicGroupNoClassGroupStudent(musicGroupId, actualSubjectId);
     }
 
     @Override

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

@@ -319,13 +319,13 @@
         SELECT * FROM student_registration WHERE user_id_= #{userId} AND class_group_id_=#{classGroupId}
     </select>
 
-    <!-- 获取乐团的学生 -->
-    <select id="findMusicGroupStudent" resultMap="StudentRegistration">
+    <!-- 获取乐团未分班的学生 -->
+    <select id="findMusicGroupNoClassGroupStudent" resultMap="StudentRegistration">
         SELECT * FROM student_registration WHERE music_group_id_ = #{musicGroupId}
         <if test="actualSubjectId != null and actualSubjectId !=''">
             AND actual_subject_id_ = #{actualSubjectId}
         </if>
-        AND payment_status_ = 1
+        AND payment_status_ = 1 AND class_group_id_ IS NULL;
     </select>
 
     <!-- 根据注册id list查询报名学生的信息 -->

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -96,13 +97,13 @@ public class StudentRegistrationController extends BaseController {
         return succeed(studentRegistrationService.findClassGroupStu(musicGroupId, classGroupId));
     }
 
-    @ApiOperation(value = "获取乐团的学生")
-    @GetMapping("/getMusicGroupStu")
-    @PreAuthorize("@pcs.hasPermissions('studentRegistration/getMusicGroupStu')")
+    @ApiOperation(value = "获取乐团未分班的学生")
+    @GetMapping("/getMusicGroupNoClassStu")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/getMusicGroupNoClassStu')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "actualSubjectId", value = "科目(声部)id,", required = true, dataType = "int")})
-    public Object getMusicGroupStu(String musicGroupId, Integer actualSubjectId) {
-        return succeed(studentRegistrationService.getMusicGroupStu(musicGroupId, actualSubjectId));
+            @ApiImplicitParam(name = "actualSubjectId", value = "科目(声部)id,", required = false, dataType = "int")})
+    public HttpResponseResult getMusicGroupStu(String musicGroupId, Integer actualSubjectId) {
+        return succeed(studentRegistrationService.findMusicGroupNoClassGroupStudent(musicGroupId, actualSubjectId));
     }
 
 }