列表查询

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

@@ -311,77 +311,78 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
                 response.setRecords(classStudentResps);
                 response.setReturnCode(ReturnCodeEnum.CODE_200.getCode());
                 response.setMessage(ReturnCodeEnum.CODE_200.getValue());
-                response.setTotal(count);
+                response.setTotal(Math.toIntExact(studentMappersPage.getTotal()));
                 return response;
 
             }
             //老师
-            if (req.getType() == 2) {
-
-                List<ClassTeacherResp> classTeacherResps = new ArrayList<>();
-                IPage<ClassGroupTeacherMapper> teacherPage = new Page<>(req.getPageNo() == null ? 0 : req.getPageNo(), req.getPageSize() == null ? 10 : req.getPageSize());
-
-                List<Integer> classGroupIds = classGroups.stream().map(ClassGroup::getId).collect(Collectors.toList());
-                QueryWrapper<ClassGroupTeacherMapper> queryWrapper2 = new QueryWrapper<>();
-                queryWrapper2.in("music_group_id_", classGroupIds);
-                IPage<ClassGroupTeacherMapper> teacherMapperIPage = classGroupTeacherMapperService.page(teacherPage, queryWrapper2);
-                List<ClassGroupTeacherMapper> list = teacherMapperIPage.getRecords();
-
-                list.forEach(tech -> {
-                    ClassTeacherResp classTeacherResp = new ClassTeacherResp();
-                    List<ClassTeacherResp> removeList = classTeacherResps.stream().filter(c -> c.getUserId().equals(tech.getUserId()) && c.getClassGroupId().equals(tech.getClassGroupId())).collect(Collectors.toList());
-                    HashSet set = new HashSet<>();
-                    Optional<ClassGroup> optional = classGroups.stream().filter(e -> e.getId().equals(tech.getClassGroupId())).findFirst();
-                    if (!CollectionUtils.isEmpty(removeList)) {
 
-                        classTeacherResp = removeList.get(0);
-                        set.addAll(classTeacherResp.getClassName());
+        }
 
-                        if (optional.isPresent()) {
-                            set.add(optional.get().getName());
-                        }
+        if (req.getType() == 2) {
 
-                        classTeacherResp.setClassName(new ArrayList<>(set));
-                    } else {
-                        SysUser sysUser = sysUserService.getById(tech.getUserId());
-                        if (sysUser != null) {
-                            classTeacherResp.setName(sysUser.getRealName());
-                            classTeacherResp.setAvatar(sysUser.getAvatar());
-                        }
-                        classTeacherResp.setUserId(tech.getUserId());
-                        classTeacherResp.setClassGroupId(tech.getClassGroupId());
-                        if (optional.isPresent()) {
-                            set.add(optional.get().getName());
-                        }
+            List<ClassTeacherResp> classTeacherResps = new ArrayList<>();
+            IPage<ClassGroupTeacherMapper> teacherPage = new Page<>(req.getPageNo() == null ? 0 : req.getPageNo(), req.getPageSize() == null ? 10 : req.getPageSize());
 
-                        classTeacherResp.setClassName(new ArrayList<>(set));
-
-                        //查询老师技能
-                        Teacher teacher = teacherService.getById(tech.getUserId());
-                        if (teacher != null && !StringUtils.isEmpty(teacher.getSubjectId())) {
-                            String ids[] = teacher.getSubjectId().split(",");
-                            List<String> stringB = Arrays.asList(ids);
-                            QueryWrapper<Subject> queryWrapperSub = new QueryWrapper<>();
-                            queryWrapper.in("id_", stringB);
-                            List<Subject> subjectList = subjectService.list(queryWrapperSub);
-                            if (!CollectionUtils.isEmpty(subjectList)) {
-                                List<String> subName = subjectList.stream().map(Subject::getName).collect(Collectors.toList());
-                                classTeacherResp.setTechSubject(subName);
-                            }
-                        }
+            List<Integer> classGroupIds = classGroups.stream().map(ClassGroup::getId).collect(Collectors.toList());
+            QueryWrapper<ClassGroupTeacherMapper> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.in("music_group_id_", classGroupIds);
+            IPage<ClassGroupTeacherMapper> teacherMapperIPage = classGroupTeacherMapperService.page(teacherPage, queryWrapper2);
+            List<ClassGroupTeacherMapper> list = teacherMapperIPage.getRecords();
+
+            list.forEach(tech -> {
+                ClassTeacherResp classTeacherResp = new ClassTeacherResp();
+                List<ClassTeacherResp> removeList = classTeacherResps.stream().filter(c -> c.getUserId().equals(tech.getUserId()) && c.getClassGroupId().equals(tech.getClassGroupId())).collect(Collectors.toList());
+                HashSet set = new HashSet<>();
+                Optional<ClassGroup> optional = classGroups.stream().filter(e -> e.getId().equals(tech.getClassGroupId())).findFirst();
+                if (!CollectionUtils.isEmpty(removeList)) {
+
+                    classTeacherResp = removeList.get(0);
+                    set.addAll(classTeacherResp.getClassName());
+
+                    if (optional.isPresent()) {
+                        set.add(optional.get().getName());
+                    }
 
-                        classTeacherResps.add(classTeacherResp);
+                    classTeacherResp.setClassName(new ArrayList<>(set));
+                } else {
+                    SysUser sysUser = sysUserService.getById(tech.getUserId());
+                    if (sysUser != null) {
+                        classTeacherResp.setName(sysUser.getRealName());
+                        classTeacherResp.setAvatar(sysUser.getAvatar());
+                    }
+                    classTeacherResp.setUserId(tech.getUserId());
+                    classTeacherResp.setClassGroupId(tech.getClassGroupId());
+                    if (optional.isPresent()) {
+                        set.add(optional.get().getName());
                     }
 
-                });
+                    classTeacherResp.setClassName(new ArrayList<>(set));
+
+                    //查询老师技能
+                    Teacher teacher = teacherService.getById(tech.getUserId());
+                    if (teacher != null && !StringUtils.isEmpty(teacher.getSubjectId())) {
+                        String ids[] = teacher.getSubjectId().split(",");
+                        List<String> stringB = Arrays.asList(ids);
+                        QueryWrapper<Subject> queryWrapperSub = new QueryWrapper<>();
+                        queryWrapperSub.in("id_", stringB);
+                        List<Subject> subjectList = subjectService.list(queryWrapperSub);
+                        if (!CollectionUtils.isEmpty(subjectList)) {
+                            List<String> subName = subjectList.stream().map(Subject::getName).collect(Collectors.toList());
+                            classTeacherResp.setTechSubject(subName);
+                        }
+                    }
 
-                response.setRecords(classTeacherResps);
-                response.setReturnCode(ReturnCodeEnum.CODE_200.getCode());
-                response.setMessage(ReturnCodeEnum.CODE_200.getValue());
-                response.setTotal(count);
-                return response;
+                    classTeacherResps.add(classTeacherResp);
+                }
 
-            }
+            });
+
+            response.setRecords(classTeacherResps);
+            response.setReturnCode(ReturnCodeEnum.CODE_200.getCode());
+            response.setMessage(ReturnCodeEnum.CODE_200.getValue());
+            response.setTotal(Math.toIntExact(teacherPage.getTotal()));
+            return response;
 
         }
         return response;