add 获取乐团报名相关信息

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

@@ -15,4 +15,14 @@ public interface MusicGroupSubjectPlanDao extends BaseDAO<Integer, MusicGroupSub
      * @return
      */
     List<MusicGroupSubjectPlan> getMusicSubjectClassPlan(@Param("musicGroupId") int musicGroupId);
+
+
+    /**
+     * 获取乐团声部报名缴费商品信息
+     *
+     * @param musicGroupId
+     * @param subjectId
+     * @return
+     */
+    MusicGroupSubjectPlan getMusicOneSubjectClassPlan(@Param("musicGroupId") int musicGroupId, @Param("subjectId") int subjectId);
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 
 import java.util.List;
 import java.util.Map;
@@ -16,6 +17,9 @@ public class MusicGroupSubjectGoodsAndInfo {
     //乐团声部商品信息
     private List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroupList;
 
+    //乐团计划及收费信息
+    private MusicGroupSubjectPlan musicGroupSubjectPlan;
+
     public Map getCourseScheduleInfo() {
         return CourseScheduleInfo;
     }
@@ -31,4 +35,12 @@ public class MusicGroupSubjectGoodsAndInfo {
     public void setMusicGroupSubjectGoodsGroupList(List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroupList) {
         this.musicGroupSubjectGoodsGroupList = musicGroupSubjectGoodsGroupList;
     }
+
+    public MusicGroupSubjectPlan getMusicGroupSubjectPlan() {
+        return musicGroupSubjectPlan;
+    }
+
+    public void setMusicGroupSubjectPlan(MusicGroupSubjectPlan musicGroupSubjectPlan) {
+        this.musicGroupSubjectPlan = musicGroupSubjectPlan;
+    }
 }

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

@@ -12,14 +12,24 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
 
     /**
      * 获取乐团声部招生计划
+     *
      * @param musicGroupId
      * @return
      */
-    List<MusicGroupSubjectPlan> getMusicSubjectClassPlan(@Param("musicGroupId") int musicGroupId);
+    List<MusicGroupSubjectPlan> getMusicSubjectClassPlan(int musicGroupId);
 
 
     /**
+     * 获取单一乐团声部招生计划
+     *
+     * @param musicGroupId
+     * @return
+     */
+    MusicGroupSubjectPlan getMusicOneSubjectClassPlan(int musicGroupId, int subjectId);
+
+    /**
      * 获取乐团声部报名缴费商品信息
+     *
      * @param musicGroupId
      * @param subjectId
      * @return

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

@@ -27,7 +27,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     private MusicGroupSubjectPlanDao musicGroupSubjectPlanDao;
 
     @Autowired
-	private StudentRegistrationService studentRegistrationService;
+    private StudentRegistrationService studentRegistrationService;
 
     @Autowired
     private GoodsService goodsService;
@@ -47,18 +47,28 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     public List<MusicGroupSubjectPlan> getMusicSubjectClassPlan(int musicGroupId) {
         List<MusicGroupSubjectPlan> musicSubjectClassPlans = musicGroupSubjectPlanDao.getMusicSubjectClassPlan(musicGroupId);
         for (MusicGroupSubjectPlan musicSubjectClassPlan : musicSubjectClassPlans) {
-			Integer noClassStuCount = studentRegistrationService.getNoClassStuCountBySubjectId(musicGroupId, musicSubjectClassPlan.getSubjectId());
-			musicSubjectClassPlan.setNoClassStudentNum(noClassStuCount);
-		}
+            Integer noClassStuCount = studentRegistrationService.getNoClassStuCountBySubjectId(musicGroupId, musicSubjectClassPlan.getSubjectId());
+            musicSubjectClassPlan.setNoClassStudentNum(noClassStuCount);
+        }
         return musicSubjectClassPlans;
     }
 
     @Override
+    public MusicGroupSubjectPlan getMusicOneSubjectClassPlan(int musicGroupId, int subjectId) {
+        return musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+    }
+
+    @Override
     public MusicGroupSubjectGoodsAndInfo getSubjectGoodsAndInfo(Integer musicGroupId, Integer subjectId) {
         MusicGroup musicGroup = musicGroupService.get(musicGroupId.toString());
 
-        Map<String,Object> courseForm = JSON.parseObject(musicGroup.getCourseForm(), Map.class);
+        //课程形态
+        Map<String, Object> courseForm = JSON.parseObject(musicGroup.getCourseForm(), Map.class);
 
+        //乐团计划及收费信息
+        MusicGroupSubjectPlan musicOneSubjectClassPlan = this.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+
+        //乐团乐器及辅件信息
         List<MusicGroupSubjectGoodsGroup> goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroup(musicGroupId, subjectId);
         goodsGroups.forEach(goodsGroup -> {
             if (goodsGroup.getType().equals(GoodsType.INSTRUMENT)) {
@@ -68,8 +78,9 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
             }
         });
         MusicGroupSubjectGoodsAndInfo musicGroupSubjectGoodsAndInfo = new MusicGroupSubjectGoodsAndInfo();
-        musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
+        musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectPlan(musicOneSubjectClassPlan);
         musicGroupSubjectGoodsAndInfo.setCourseScheduleInfo(courseForm);
+        musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
         return musicGroupSubjectGoodsAndInfo;
     }
 }

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

@@ -97,4 +97,10 @@
         LEFT JOIN subject sb ON sb.id_ = sp.subject_id_
         WHERE sp.music_group_id_=#{musicGroupId}
     </select>
+    <select id="getMusicOneSubjectClassPlan" resultMap="MusicGroupSubjectPlan">
+        SELECT sp.*, sb.name_
+        FROM music_group_subject_plan sp
+        LEFT JOIN subject sb ON sb.id_ = sp.subject_id_
+        WHERE sp.music_group_id_=#{musicGroupId} AND sp.subject_id_=#{subjectId}
+    </select>
 </mapper>