Merge remote-tracking branch 'origin/music_detail' into music_detail

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

@@ -102,6 +102,7 @@
     <resultMap id="Mapper" type="com.ym.mec.biz.dal.dto.Mapper">
         <result column="key_" property="key"/>
         <result column="value_" property="value"/>
+        <result column="subject_id_" property="courseScheduleId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -1558,7 +1559,7 @@
     </select>
     
     <select id="countStudentWithSubjectByMusicGroupId" resultMap="Mapper">
-        select s.name_ key_,count(sr.id_) value_ from student_registration sr LEFT JOIN subject s on sr.actual_subject_id_ = s.id_ 
+        select sr.actual_subject_id_ subject_id_, s.name_ key_,count(sr.id_) value_ from student_registration sr LEFT JOIN subject s on sr.actual_subject_id_ = s.id_ 
 		where sr.music_group_status_ = 'NORMAL' and sr.music_group_id_ = #{musicGroupId} 
 		group by sr.actual_subject_id_
     </select>

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

@@ -3,6 +3,8 @@ package com.ym.mec.web.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.ui.ModelMap;
@@ -13,8 +15,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dto.MusicGroupBasicDto;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.service.CooperationOrganLinkmanService;
 import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 
 @RequestMapping("musicGroupRecord")
@@ -29,6 +33,9 @@ public class MusicGroupRecordController extends BaseController {
 	private MusicGroupService musicGroupService;
 	
 	@Autowired
+	private OrganizationService organizationService;
+	
+	@Autowired
 	private StudentRegistrationDao studentRegistrationDao;
 	
 	@Autowired
@@ -54,9 +61,16 @@ public class MusicGroupRecordController extends BaseController {
 	@PreAuthorize("@pcs.hasPermissions('musicGroupRecord/queryStudentAndTeacher')")
 	public Object queryStudentAndTeacher(String musicGroupId) {
 		
+		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+		if(musicGroup == null){
+			return failed("乐团信息查询失败");
+		}
+		
 		ModelMap model = new ModelMap();
 
 		model.put("subject", studentRegistrationDao.countStudentWithSubjectByMusicGroupId(musicGroupId));
+		
+		model.put("gradeMap", organizationService.getGradeList(musicGroup.getOrganId()));
 		model.put("grade", studentRegistrationDao.countStudentWithGradeByMusicGroupId(musicGroupId));
 		model.put("teacher", classGroupDao.countTeacherByMusicGroupId(musicGroupId));