Browse Source

Merge remote-tracking branch 'origin/system_fee_update' into system_fee_update

zouxuan 4 years ago
parent
commit
b448850fb6

+ 12 - 0
mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupRecordController.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,9 +14,11 @@ import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dto.MusicGroupBasicDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.page.MusicGroupRecordStudentQueryInfo;
 import com.ym.mec.biz.service.CooperationOrganLinkmanService;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.OrganizationService;
+import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.common.controller.BaseController;
 
 @RequestMapping("eduMusicGroupRecord")
@@ -37,6 +40,9 @@ public class EduMusicGroupRecordController extends BaseController {
 	
 	@Autowired
 	private ClassGroupDao classGroupDao;
+	
+	@Autowired
+	private StudentRegistrationService studentRegistrationService;
 
 	@ApiOperation(value = "查询基本信息")
 	@GetMapping("/queryBasicInfo")
@@ -71,4 +77,10 @@ public class EduMusicGroupRecordController extends BaseController {
 		
 		return succeed(model);
 	}
+
+	@ApiOperation(value = "学员列表")
+	@GetMapping("/queryStudentInfo")
+	public Object queryStudentInfo(MusicGroupRecordStudentQueryInfo queryInfo) {
+		return succeed(studentRegistrationService.queryStudentRegisterInstrumentsDetailList(queryInfo));
+	}
 }