乐团档案

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

@@ -585,4 +585,6 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param classGroupId
      */
     void cancelPreCourseSchedule(Integer musicGroupSchoolTermCourseDetailId, Integer classGroupId);
+
+    List<ClassGroup> queryStudentClassGroupsAndTeacher(String musicGroupId);
 }

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

@@ -2747,6 +2747,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
+    public List<ClassGroup> queryStudentClassGroupsAndTeacher(String musicGroupId) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        List<ClassGroup> classGroups = classGroupDao.queryStudentClassGroups(musicGroupId, sysUser.getId());
+        if(classGroups.size() == 0){
+            classGroups.forEach(e->{
+                e.setTeacherMapperList(classGroupTeacherMapperDao.findClassGroupTeachers(e.getId().toString()));
+            });
+        }
+        return classGroups;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult preCourseSchedule(List<ClassGroup4MixDto> classGroup4MixDtos) {
         Date date = new Date();

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

@@ -40,7 +40,7 @@ public class MusicGroupDetailController extends BaseController {
     @Autowired
     private MusicGroupService musicGroupService;
     @Autowired
-    private ClassGroupDao classGroupDao;
+    private ClassGroupService classGroupService;
 
     @ApiOperation("获取学员退团页面数据")
     @RequestMapping(value = "getQuitGroupDetail")
@@ -83,13 +83,7 @@ public class MusicGroupDetailController extends BaseController {
 
     @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);
+    public Object queryStudentClassGroupsAndTeacher(String musicGroupId) {
+        return succeed(classGroupService.queryStudentClassGroupsAndTeacher(musicGroupId));
     }
 }