fix musicGroup reg

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupSubjectPlanService.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.MusicGroupRegResp;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.common.service.BaseService;
@@ -36,4 +37,11 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
      */
     MusicGroupSubjectGoodsAndInfo getSubjectGoodsAndInfo(Integer musicGroupId, Integer subjectId);
 
+    /**
+     * 乐团报名基本信息
+     * @param musicGroupId
+     * @return
+     */
+    MusicGroupRegResp getMusicGroupRegInfo(Integer musicGroupId);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupSubjectPlanServiceImpl.java

@@ -2,17 +2,15 @@ package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dto.MusicGroupRegResp;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfo;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.GoodsType;
 import com.ym.mec.biz.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.biz.dal.dao.MusicGroupSubjectPlanDao;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
@@ -38,6 +36,9 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     @Autowired
     private MusicGroupService musicGroupService;
 
+    @Autowired
+    private SubjectService subjectService;
+
     @Override
     public BaseDAO<Integer, MusicGroupSubjectPlan> getDAO() {
         return musicGroupSubjectPlanDao;
@@ -83,4 +84,18 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
         return musicGroupSubjectGoodsAndInfo;
     }
+
+    @Override
+    public MusicGroupRegResp getMusicGroupRegInfo(Integer musicGroupId) {
+        MusicGroupRegResp musicGroupRegResp = new MusicGroupRegResp();
+
+        //乐团信息
+        MusicGroup musicGroup = musicGroupService.get(musicGroupId.toString());
+        musicGroupRegResp.setMusicGroupName(musicGroup.getName());
+        //声部信息
+        List<Subject> subjectList = subjectService.findSubByMusicGroupId(musicGroupId);
+        musicGroupRegResp.setSubjectList(subjectList);
+
+        return musicGroupRegResp;
+    }
 }

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

@@ -46,11 +46,11 @@ public class RegisterController extends BaseController {
         return succeed(studentRegistration);
     }
 
-    @ApiOperation(value = "通过乐团编号获取声部列表")
-    @GetMapping("/findSubByMusicGroupId")
+    @ApiOperation(value = "获取乐团报名所需信息")
+    @GetMapping("/getMusicGroupRegInfo")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public HttpResponseResult findSubByMusicGroupId(Integer musicGroupId) {
-        return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
+    public HttpResponseResult getMusicGroupRegInfo(Integer musicGroupId) {
+        return succeed(musicGroupSubjectPlanService.getMusicGroupRegInfo(musicGroupId));
     }