乐团档案

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

@@ -20,7 +20,9 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="MusicGroupQuestionnaire" >
-		SELECT * FROM music_group_questionnaire WHERE id_ = #{id} 
+		SELECT mgq.*,su.real_name_ FROM music_group_questionnaire mgq
+		LEFT JOIN sys_user su ON su.id_ = mgq.operator_id_
+		WHERE mgq.id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->

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

@@ -2,6 +2,9 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dto.Mapper;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.MusicGroupPerformanceQueryInfo;
@@ -13,8 +16,12 @@ import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RequestMapping("musicGroupDetail")
 @Api(tags = "乐团档案服务")
 @RestController
@@ -32,6 +39,8 @@ public class MusicGroupDetailController extends BaseController {
     private MusicGroupTrainPlanService musicGroupTrainPlanService;
     @Autowired
     private MusicGroupService musicGroupService;
+    @Autowired
+    private ClassGroupDao classGroupDao;
 
     @ApiOperation("获取学员退团页面数据")
     @RequestMapping(value = "getQuitGroupDetail")
@@ -72,4 +81,15 @@ public class MusicGroupDetailController extends BaseController {
         return succeed(photoService.queryPhotoPage(queryInfo));
     }
 
+    @ApiOperation(value = "查询学员班级列表")
+    @GetMapping("/queryStudentAndTeacher")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupRecord/queryStudentAndTeacher')")
+    public Object queryStudentAndTeacher(String musicGroupId) {
+        MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+        if(musicGroup == null){
+            return failed("乐团信息查询失败");
+        }
+        List<Mapper> mappers = classGroupDao.countTeacherByMusicGroupId(musicGroupId);
+        return succeed(mappers);
+    }
 }