fix musicGroup reg

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.xml.soap.Name;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -35,9 +36,9 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation("获取学生所在乐团列表")
     @GetMapping(value = "/queryUserMusicGroups")
-    public Object queryUserMusicGroups(){
+    public Object queryUserMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
+        if (sysUser == null) {
             return failed("获取用户信息失败");
         }
         return succeed(musicGroupService.queryUserMusicGroups(sysUser.getId()));
@@ -45,9 +46,9 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation("获取学生个人中心乐团信息")
     @GetMapping(value = "/queryPersonalMusicGroups")
-    public Object queryPersonalMusicGroups(){
+    public Object queryPersonalMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
+        if (sysUser == null) {
             return failed("获取用户信息失败");
         }
         return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
@@ -55,9 +56,9 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "根据学员编号，获取有关联的老师列表")
     @GetMapping("/findTeachersByStuId")
-    public Object findTeachersByStuId(){
+    public Object findTeachersByStuId() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
+        if (sysUser == null) {
             return failed("获取用户信息失败");
         }
         return succeed(musicGroupService.findTeachersByStuId(sysUser.getId()));
@@ -66,10 +67,11 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "获取乐团声部费用信息及乐器和辅件")
     @GetMapping("/getSubjectGoodsAndInfo")
-    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public HttpResponseResult getSubjectGoodsAndInfo(Integer musicGroupId) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "subjectId", value = "声部编号", required = true, dataType = "Integer")})
+    public HttpResponseResult getSubjectGoodsAndInfo(Integer musicGroupId, Integer subjectId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, 1);
+        MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId);
         return succeed(subjectGoodsAndInfo);
     }