查询

mec-education/src/main/java/com/ym/mec/education/base/BaseResponse.java

@@ -54,8 +54,8 @@ public class BaseResponse<T> extends Response implements Serializable {
     }
     public static BaseResponse noDataExists() {
         BaseResponse baseResponse = new BaseResponse<>();
-        baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
-        baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
+        baseResponse.setReturnCode(ReturnCodeEnum.CODE_207.getCode());
+        baseResponse.setMessage(ReturnCodeEnum.CODE_207.getValue());
         return baseResponse;
     }
 }

mec-education/src/main/java/com/ym/mec/education/base/PageResponse.java

@@ -181,4 +181,11 @@ public class PageResponse<T> extends Response implements Serializable {
         pageResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
         return pageResponse;
     }
+
+    public static BaseResponse noDataExists() {
+        BaseResponse baseResponse = new BaseResponse<>();
+        baseResponse.setReturnCode(ReturnCodeEnum.CODE_207.getCode());
+        baseResponse.setMessage(ReturnCodeEnum.CODE_207.getValue());
+        return baseResponse;
+    }
 }

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

@@ -191,14 +191,14 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
     public PageResponse classGroupList(ClassGroupReq req) {
 
         PageResponse response = new PageResponse();
-        IPage<ClassGroup> page = new Page(req.getPageNo() == null ? 0 : req.getPageNo(), req.getPageSize() == null ? 10 : req.getPageSize());
+        IPage<ClassGroup> page = new Page(req.getPageNo() == null ? 1 : req.getPageNo(), req.getPageSize() == null ? 10 : req.getPageSize());
         QueryWrapper<ClassGroup> queryWrapper1 = new QueryWrapper<>();
         if (req != null && req.getMusicGroupId() != null) {
             queryWrapper1.eq("music_group_id_", req.getMusicGroupId());
         }
 
         IPage<ClassGroup> classGroupPage = classGroupService.page(page, queryWrapper1);
-        int count = classGroupService.count(queryWrapper1);
+
         if (classGroupPage.getRecords() == null && classGroupPage.getRecords().isEmpty()) {
             response.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
             return response;
@@ -206,6 +206,10 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
 
         List<ClassGroup> classGroups = classGroupPage.getRecords();
 
+        if(CollectionUtils.isEmpty(classGroups)){
+            return PageResponse.noDataExists();
+        }
+
         //班级
         if (req.getType() == 0) {
             List<ClassGroupResp> groupRespList = new ArrayList<>();
@@ -230,7 +234,7 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
                     }
 
                     queryWrapper2.eq("music_group_id_", e.getId()).eq("teacher_role_", TeachTypeEnum.TEACHING.getCode());
-                    List<ClassGroupTeacherMapper> list2 = classGroupTeacherMapperService.list();
+                    List<ClassGroupTeacherMapper> list2 = classGroupTeacherMapperService.list(queryWrapper2);
                     if (!CollectionUtils.isEmpty(list2)) {
                         List<Integer> secdId = list2.stream().map(ClassGroupTeacherMapper::getUserId).collect(Collectors.toList());
                         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
@@ -248,7 +252,7 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
             response.setRecords(groupRespList);
             response.setReturnCode(ReturnCodeEnum.CODE_200.getCode());
             response.setMessage(ReturnCodeEnum.CODE_200.getValue());
-            response.setTotal(count);
+            response.setTotal(Math.toIntExact(classGroupPage.getTotal()));
             return response;
         }
         //学生