update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -27,10 +27,11 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     /**
      * 获取个人中心乐团数据
-     * @param id
+     * @param userId
+     * @param musicGroupId
      * @return
      */
-    MusicCardDto queryPersonalMusicGroups(Integer id);
+    MusicCardDto queryPersonalMusicGroups(@Param("userId") Integer userId,@Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取用户有效的乐团数

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

@@ -40,7 +40,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param id
 	 * @return
 	 */
-	MusicCardDto queryPersonalMusicGroups(Integer id);
+	MusicCardDto queryPersonalMusicGroups(Integer id,String musicGroupId);
 
 	/**
 	 * 根据学员编号获取相关老师列表

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

@@ -41,4 +41,11 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
      * @return
      */
     MusicGroupRegRespDto getMusicGroupRegInfo(String musicGroupId);
+
+    /**
+     * 报名人数加一
+     * @param musicGroupId
+     * @param subjectId
+     */
+    void addApplyStudentNum(String musicGroupId, Integer subjectId);
 }

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

@@ -196,12 +196,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    public MusicCardDto queryPersonalMusicGroups(Integer id) {
-        MusicCardDto musicCardDto = musicGroupDao.queryPersonalMusicGroups(id);
+    public MusicCardDto queryPersonalMusicGroups(Integer id,String musicGroupId) {
+        MusicCardDto musicCardDto = musicGroupDao.queryPersonalMusicGroups(id,musicGroupId);
         if(musicCardDto != null){
             musicCardDto.setMusicGroupNum(musicGroupDao.countUserMusicGroups(id));
             musicCardDto.setVipClassNum(musicGroupDao.countCourseByType(id, ClassGroupTypeEnum.VIP));
-            return musicGroupDao.queryPersonalMusicGroups(id);
+            return musicGroupDao.queryPersonalMusicGroups(id,musicGroupId);
         }
         return new MusicCardDto();
     }

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

@@ -14,6 +14,7 @@ import com.ym.mec.biz.dal.dao.MusicGroupSubjectPlanDao;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -103,4 +104,13 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 
         return musicGroupRegResp;
     }
+
+    @Override
+    public void addApplyStudentNum(String musicGroupId, Integer subjectId) {
+        MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+        int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
+        musicOneSubjectClassPlan.setApplyStudentNum(applyNum + 1);
+        musicOneSubjectClassPlan.setUpdateTime(new Date());
+        musicGroupSubjectPlanDao.update(musicOneSubjectClassPlan);
+    }
 }

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

@@ -164,9 +164,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setUserId(sysUser.getId());
         studentRegistrationDao.insert(studentRegistration);
         //增加报名学生数
-        MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
-        int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
-        musicOneSubjectClassPlan.setApplyStudentNum(applyNum + 1);
+        musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
         return studentRegistration;
     }
 
@@ -384,6 +382,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             studentRegistration.setUserId(userId);
             //学生报名表
             studentRegistrationDao.insert(studentRegistration);
+            //增加报名学生数
+            musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
             if (studentRegistration.getClassGroupId() != null) {
                 ClassGroup classGroup = classGroupDao.get(studentRegistration.getClassGroupId());
                 if (classGroup != null) {

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -190,7 +190,7 @@
 		FROM student_registration sr
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
-		WHERE sr.user_id_ = #{userId}
+		WHERE sr.user_id_ = #{userId} AND sr.music_group_id_ = #{musicGroupId}
 	</select>
 
 	<select id="countUserMusicGroups" resultType="int">

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

@@ -17,6 +17,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
@@ -65,12 +66,15 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation("获取学生个人中心乐团信息")
     @GetMapping(value = "/queryPersonalMusicGroups")
-    public Object queryPersonalMusicGroups() {
+    public Object queryPersonalMusicGroups(String musicGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("获取用户信息失败");
         }
-        return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
+        if(StringUtils.isEmpty(musicGroupId)){
+            return failed("参数校验错误");
+        }
+        return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId(),musicGroupId));
     }
 
     @ApiOperation(value = "根据学员编号，获取有关联的老师列表")