Merge branch 'music_detail' of http://git.dayaedu.com/yonge/mec

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupTrainPlanController.java

@@ -7,18 +7,18 @@ import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
+import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.MusicGroupTrainPlanService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -40,6 +40,9 @@ public class EduMusicGroupTrainPlanController extends BaseController {
 	@Autowired
 	private StudentRegistrationDao studentRegistrationDao;
 
+	@Autowired
+	private ClassGroupService classGroupService;
+
 	@ApiOperation("新增乐团训练规划")
 	@PostMapping(value = "add")
 	public Object add(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
@@ -105,4 +108,10 @@ public class EduMusicGroupTrainPlanController extends BaseController {
 	public Object queryCourseType(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
 		return succeed(musicGroupTrainPlanService.queryCourseType(musicGroupTrainPlanSaveDto));
 	}
+
+	@ApiOperation(value = "乐团所有班级列表")
+	@GetMapping("/findAllClassGroupByMusicGroup")
+	public HttpResponseResult findAllClassGroupByMusicGroup(String musicGroupId, String type) {
+		return succeed(classGroupService.findAllClassGroupByMusicGroup(musicGroupId, type));
+	}
 }