Merge branch 'merge_music_group'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupRegsDto.java

@@ -0,0 +1,30 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class MusicGroupRegsDto {
+
+    @ApiModelProperty(value = "乐团编号", required = true)
+    private String musicGroupId;
+
+    @ApiModelProperty(value = "学员注册ids", required = true)
+    private List<Long> registerIds;
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public List<Long> getRegisterIds() {
+        return registerIds;
+    }
+
+    public void setRegisterIds(List<Long> registerIds) {
+        this.registerIds = registerIds;
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.dto.MusicGroupRegsDto;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -282,11 +283,11 @@ public class MusicGroupController extends BaseController {
 	@ApiOperation(value = "乐团添加报名学员")
 	@PostMapping("/addMusicGroupRegs")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/addMusicGroupRegs')")
-	public HttpResponseResult<List<StudentRegistration>> addMusicGroupRegs(String musicGroupId, List<Long> registerIds) throws Exception {
-		if(registerIds.size() <=0){
+	public HttpResponseResult<List<StudentRegistration>> addMusicGroupRegs(@RequestBody MusicGroupRegsDto musicGroupRegsDto) throws Exception {
+		if(musicGroupRegsDto.getRegisterIds().size() <=0){
 			return failed("请选择要添加的学员");
 		}
-		return succeed(musicGroupService.addMusicGroupRegs(musicGroupId,registerIds));
+		return succeed(musicGroupService.addMusicGroupRegs(musicGroupRegsDto.getMusicGroupId(),musicGroupRegsDto.getRegisterIds()));
 	}
 
 }