|
|
@@ -2,6 +2,7 @@ package com.ym.mec.web.controller.education;
|
|
|
|
|
|
import com.ym.mec.biz.dal.dao.MusicGroupDao;
|
|
|
import com.ym.mec.biz.dal.dto.StudentPreRegistrationDto;
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroup;
|
|
|
import com.ym.mec.biz.dal.entity.StudentInstrument;
|
|
|
import com.ym.mec.biz.dal.entity.StudentPreRegistration;
|
|
|
import com.ym.mec.biz.dal.page.StudentInstrumentQueryInfo;
|
|
|
@@ -54,7 +55,12 @@ public class EduStudentRegistrationController extends BaseController {
|
|
|
@ApiOperation(value = "乐团预报名列表分页查询")
|
|
|
@GetMapping("/queryPreApplyList")
|
|
|
public Object queryPreApplyList(StudentPreRegistrationQueryInfo queryInfo) {
|
|
|
- ModelMap model = new ModelMap();
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(queryInfo.getMusicGroupId());
|
|
|
+
|
|
|
+ ModelMap model = new ModelMap();
|
|
|
+ //FIX:2238 直接从乐团组获取tenantId
|
|
|
+ queryInfo.setTenantId(musicGroup.getTenantId());
|
|
|
+
|
|
|
PageInfo<StudentPreRegistrationDto> dataList = studentPreRegistrationService.queryListForPage(queryInfo);
|
|
|
model.put("dataList", dataList);
|
|
|
|
|
|
@@ -77,7 +83,7 @@ public class EduStudentRegistrationController extends BaseController {
|
|
|
model.put("cloudTeacher", cloudTeacher);
|
|
|
model.put("total", studentPreRegistrationList.size());
|
|
|
|
|
|
- model.put("musicGroup", musicGroupDao.get(queryInfo.getMusicGroupId()));
|
|
|
+ model.put("musicGroup", musicGroup);
|
|
|
|
|
|
return succeed(model);
|
|
|
}
|
yanite