update

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

@@ -98,4 +98,18 @@ public interface StudentManageDao {
      * @return
      */
     int countStudentPayment(Map<String, Object> params);
+
+    /**
+     * 获取乐团管理学员列表
+     * @param params
+     * @return
+     */
+    List queryMusicGroupStudent(Map<String, Object> params);
+
+    /**
+     * COUNT乐团管理学员列表
+     * @param params
+     * @return
+     */
+    int countMusicGroupStudent(Map<String, Object> params);
 }

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

@@ -71,4 +71,11 @@ public interface StudentManageService {
      * @return
      */
     PageInfo queryStudentPayment(TeacherPaymentRecordInfo queryInfo);
+
+    /**
+     * 获取乐团管理、学员列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo queryMusicGroupStudent(StudentManageQueryInfo queryInfo);
 }

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

@@ -148,4 +148,24 @@ public class StudentManageServiceImpl implements StudentManageService {
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    public PageInfo queryMusicGroupStudent(StudentManageQueryInfo queryInfo) {
+        PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List dataList = null;
+        int count = studentManageDao.countMusicGroupStudent(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentManageDao.queryMusicGroupStudent(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

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

@@ -193,7 +193,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Override
 	public PageInfo<MusicGroupTeachersDto> queryMusicGroupTeachers(QueryInfo queryInfo) {
 		PageInfo<MusicGroupTeachersDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-		Map<String, Object> params = new HashMap<String, Object>();
+		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 
 		List<MusicGroupTeachersDto> dataList = null;

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

@@ -8,7 +8,6 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

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

@@ -34,6 +34,13 @@ public class StudentManageController extends BaseController {
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }
 
+    @ApiOperation(value = "乐团管理--乐团详情--获取学员列表")
+    @GetMapping("/queryMusicGroupStudent")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/queryMusicGroupStudent')")
+    public Object queryMusicGroupStudent(StudentManageQueryInfo queryInfo){
+        return succeed(studentManageService.queryMusicGroupStudent(queryInfo));
+    }
+
     @ApiOperation(value = "根据学生ID获取学生基本报名信息")
     @GetMapping("/findStudentBaseInfo")
     @PreAuthorize("@pcs.hasPermissions('studentManage/findStudentBaseInfo')")