update

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

@@ -79,22 +79,7 @@ public class StudentRegistrationController extends BaseController {
     @GetMapping("/queryPreApplyList")
     @PreAuthorize("@pcs.hasPermissions('studentRegistration/queryPreApplyList')")
     public Object queryPreApplyList(StudentPreRegistrationQueryInfo queryInfo) {
-    	ModelMap model = new ModelMap();
-    	PageInfo<StudentPreRegistrationDto> dataList = studentPreRegistrationService.queryListForPage(queryInfo);
-    	model.put("dataList", dataList);
-    	
-    	Map<String, Object> params = new HashMap<String, Object>();
-		MapUtil.populateMap(params, queryInfo);
-    	List<StudentPreRegistration> studentPreRegistrationList = studentPreRegistrationService.findAll(params);
-    	long instrument = studentPreRegistrationList.stream().filter(p -> p.getKitPurchaseMethod().equals("OWNED")).count();
-    	long cloudTeacher = studentPreRegistrationList.stream().filter(p -> p.getCloudTeacherMethod().equals("OWNED")).count();
-    	
-    	model.put("instrument", instrument);
-    	model.put("cloudTeacher", cloudTeacher);
-    	
-    	model.put("musicGroup", musicGroupDao.get(queryInfo.getMusicGroupId()));
-    	
-        return succeed(model);
+        return succeed(studentPreRegistrationService.queryListForPage(queryInfo));
     }
 
     @ApiOperation(value = "乐团预报名声部列表查询")