分页代码优化

server/src/main/java/com/qmth/jkserver/controller/system/ExamTaskController.java

@@ -109,12 +109,12 @@ public class ExamTaskController extends BaseSystemController {
         if (Objects.nonNull(schoolId) && schoolId.longValue() < 0) {
             schoolId = null;
         }
-        long count = examPlanDao.findByExamCodeAndExamTaskCount(examCode, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(result) ? result.name() : null,
-                ExamType.NORMAL.name(), ExamStatus.PUBLISHED.name(), true, schoolId, creatorId);
+//        long count = examPlanDao.findByExamCodeAndExamTaskCount(examCode, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(result) ? result.name() : null,
+//                ExamType.NORMAL.name(), ExamStatus.PUBLISHED.name(), true, schoolId, creatorId);
         IPage<ExamPlanAnaTaskResult> examPlanIPage = examPlanDao.findByExamCodeAndExamTask(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNo, pageSize)
                 , examCode, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(result) ? result.name() : null,
                 ExamType.NORMAL.name(), ExamStatus.PUBLISHED.name(), true, schoolId, creatorId);
-        return new PageImpl<ExamPlanAnaTaskResult>(examPlanIPage.getRecords(), PageRequest.of(pageNo - 1, pageSize), count);
+        return new PageImpl<ExamPlanAnaTaskResult>(examPlanIPage.getRecords(), PageRequest.of(pageNo - 1, pageSize), examPlanIPage.getTotal());
     }
 
     @ApiOperation(value = "考务任务管理云阅卷同步接口")

server/src/main/java/com/qmth/jkserver/service/impl/ExamKjHZServiceImpl.java

@@ -247,7 +247,7 @@ public class ExamKjHZServiceImpl implements ExamKjHZService {
         if (already != null) {
             examRoomQueryWrapper.lambda().eq(ExamRoom::getKjAlready, already);
         }
-        Long count = Long.valueOf(jkExamRoomService.count(examRoomQueryWrapper));
+//        Long count = Long.valueOf(jkExamRoomService.count(examRoomQueryWrapper));
 
 //        Sort.Order order1 = new Sort.Order(Direction.ASC, "placeCode");
 //        Sort.Order order2 = new Sort.Order(Direction.ASC, "roomCode");
@@ -283,7 +283,7 @@ public class ExamKjHZServiceImpl implements ExamKjHZService {
             }
         }
         PageImpl<ExamKjProgressDto> pageResult = new PageImpl<ExamKjProgressDto>(results,
-                PageRequest.of(pageNo - 1, pageSize), count.longValue());
+                PageRequest.of(pageNo - 1, pageSize), examRoomIPage.getTotal());
         return pageResult;
     }
 
@@ -336,7 +336,7 @@ public class ExamKjHZServiceImpl implements ExamKjHZService {
         if (StringUtils.isNotEmpty(examKjProgressDto.getRoomCode())) {
             examRoomQueryWrapper.lambda().eq(ExamRoom::getRoomCode, examKjProgressDto.getRoomCode());
         }
-        Long count = Long.valueOf(jkExamRoomService.count(examRoomQueryWrapper));
+//        Long count = Long.valueOf(jkExamRoomService.count(examRoomQueryWrapper));
 
 //        Sort.Order order1 = new Sort.Order(Direction.ASC, "placeCode");
 //        Sort.Order order2 = new Sort.Order(Direction.ASC, "roomCode");
@@ -393,7 +393,7 @@ public class ExamKjHZServiceImpl implements ExamKjHZService {
             }
         }
         PageImpl<ExamKjProgressDto> pageResult = new PageImpl<ExamKjProgressDto>(results,
-                PageRequest.of(pageNo - 1, pageSize), count);
+                PageRequest.of(pageNo - 1, pageSize), examRoomIPage.getTotal());
         return pageResult;
     }
 }

server/src/main/java/com/qmth/jkserver/service/impl/ExamKwHZServiceImpl.java

@@ -83,8 +83,8 @@ public class ExamKwHZServiceImpl implements ExamKwHZService {
 //        AggregationResults<DBObject> tresult = mongoTemplate.aggregate(totalAgg, ExamStudent.class,
 //                DBObject.class);
 //        int total = tresult.getMappedResults().size();
-        List<Map> listTotal = examStudentDao.findByExamCodeAndBatchIdAndPlaceCodeAndRoomCodeAndPlaceName(code, batchId, Objects.nonNull(placeCode) ? new HashSet<>(Arrays.asList(placeCode)) : placeCodeLike(code, placeName), roomCode, placeName);
-        int total = listTotal.size();
+//        List<Map> listTotal = examStudentDao.findByExamCodeAndBatchIdAndPlaceCodeAndRoomCodeAndPlaceName(code, batchId, Objects.nonNull(placeCode) ? new HashSet<>(Arrays.asList(placeCode)) : placeCodeLike(code, placeName), roomCode, placeName);
+//        int total = listTotal.size();
 //        Aggregation agg = Aggregation.newAggregation(ExamStudent.class,
 //                Aggregation.match(criteria),
 //                Aggregation.group("stageId", "batchId", "placeCode", "roomCode", "batchName").count().as("fullStudentNum"),
@@ -150,7 +150,7 @@ public class ExamKwHZServiceImpl implements ExamKwHZService {
             long realStudentNum = examStudentAnswerDao.findByExamCodeAndStageIdAndBatchIdAndPlaceCodeAndRoomCodeAndAbsentAndCheatAndAbortAndPlaceNameCount(code, stageId, bid, new HashSet<>(Arrays.asList(pCode)), rCode, false, null, null, null);
             examStudentCountDto.setRealityStudentNum(realStudentNum);
         }
-        return new PageImpl<ExamStudentCountDto>(resultList, PageRequest.of(pageNo - 1, pageSize), total);
+        return new PageImpl<ExamStudentCountDto>(resultList, PageRequest.of(pageNo - 1, pageSize), examStudentIpage.getTotal());
     }
 
     @Override
@@ -175,7 +175,7 @@ public class ExamKwHZServiceImpl implements ExamKwHZService {
 //        if (StringUtils.isEmpty(placeCode) && StringUtils.isNotEmpty(placeName)) {
 //            query.addCriteria(Criteria.where("student.placeCode").in(placeCodeLike(examCode, placeName)));
 //        }
-        long total = 0;
+//        long total = 0;
         Boolean absent = null, cheat = null, abort = null;
         if ("absent".equals(condition)) {
 //            query.addCriteria(Criteria.where("isAbsent").is(true));
@@ -190,7 +190,7 @@ public class ExamKwHZServiceImpl implements ExamKwHZService {
             throw JkServerException.withFieldValidateError("错误的查询条件:" + condition);
         }
 //        total = this.mongoTemplate.count(query, ExamStudentAnswer.class);
-        total = examStudentAnswerDao.findByExamCodeAndStageIdAndBatchIdAndPlaceCodeAndRoomCodeAndAbsentAndCheatAndAbortAndPlaceNameCount(examCode, null, batchId, Objects.nonNull(placeCode) ? new HashSet<>(Arrays.asList(placeCode)) : placeCodeLike(examCode, placeName), roomCode, absent, cheat, abort, placeName);
+//        total = examStudentAnswerDao.findByExamCodeAndStageIdAndBatchIdAndPlaceCodeAndRoomCodeAndAbsentAndCheatAndAbortAndPlaceNameCount(examCode, null, batchId, Objects.nonNull(placeCode) ? new HashSet<>(Arrays.asList(placeCode)) : placeCodeLike(examCode, placeName), roomCode, absent, cheat, abort, placeName);
 //        Sort.Order order1 = new Sort.Order(Direction.ASC, "student.ticketNo");
 //        Sort.Order order2 = new Sort.Order(Direction.ASC, "student.courseCode");
 //        query.with(new Sort(order1, order2));
@@ -202,7 +202,7 @@ public class ExamKwHZServiceImpl implements ExamKwHZService {
         for (Map answer : examstudentAnswerIpage.getRecords()) {
             detailDtos.add(convert(answer));
         }
-        return new PageImpl<ExamStudenDetailDto>(detailDtos, PageRequest.of(pageNo - 1, pageSize), total);
+        return new PageImpl<ExamStudenDetailDto>(detailDtos, PageRequest.of(pageNo - 1, pageSize), examstudentAnswerIpage.getTotal());
     }
 
     //查询重考记录
@@ -231,7 +231,7 @@ public class ExamKwHZServiceImpl implements ExamKwHZService {
 //        }
 ////        long total = this.mongoTemplate.count(query, ExamRepeatRecord.class);
 //        long total = jkExamRepeatRecordService.count(examRepeatRecordQueryWrapper);
-        long total = examRepeatRecordDao.findByExamCodeAndBatchIdAndPlaceCodeAndRoomCodeAndPlaceNameByCount(examCode, batchId, Objects.nonNull(placeCode) ? new HashSet<>(Arrays.asList(placeCode)) : placeCodeLike(examCode, placeName), roomCode, placeName);
+//        long total = examRepeatRecordDao.findByExamCodeAndBatchIdAndPlaceCodeAndRoomCodeAndPlaceNameByCount(examCode, batchId, Objects.nonNull(placeCode) ? new HashSet<>(Arrays.asList(placeCode)) : placeCodeLike(examCode, placeName), roomCode, placeName);
 
 //        Sort.Order order1 = new Sort.Order(Direction.ASC, "ticketNo");
 //        Sort.Order order2 = new Sort.Order(Direction.ASC, "courseCode");
@@ -244,7 +244,7 @@ public class ExamKwHZServiceImpl implements ExamKwHZService {
         for (ExamRepeatRecord record : list.getRecords()) {
             detailDtos.add(convert(record));
         }
-        return new PageImpl<ExamStudenDetailDto>(detailDtos, PageRequest.of(pageNo - 1, pageSize), total);
+        return new PageImpl<ExamStudenDetailDto>(detailDtos, PageRequest.of(pageNo - 1, pageSize), list.getTotal());
     }
 
     private Set<String> placeCodeLike(String examCode, String placeName) {

server/src/main/java/com/qmth/jkserver/service/impl/ExamProgressStatisticServiceImpl.java

@@ -331,7 +331,7 @@ public class ExamProgressStatisticServiceImpl implements ExamProgressStatisticSe
         }
         // 统计查询结果数量
 //        long count = mongoTemplate.count(query, ExamStudent.class);
-        long count = examStudentService.count(examStudentQueryWrapper);
+//        long count = examStudentService.count(examStudentQueryWrapper);
         // 排序 考点 -》 考场 -》 课程编号 -》 准考证号
 //        Sort.Order order1 = new Sort.Order(Sort.Direction.ASC, "placeCode");
 //        Sort.Order order2 = new Sort.Order(Sort.Direction.ASC, "roomCode");
@@ -419,6 +419,6 @@ public class ExamProgressStatisticServiceImpl implements ExamProgressStatisticSe
             cell.setExamStatus(examFinishStatusEnum != null ? examFinishStatusEnum.getValue() : null);
             examProgressDtoList.add(cell);
         }
-        return new PageImpl<>(examProgressDtoList, PageRequest.of(pageNumber - 1, pageSize), count);
+        return new PageImpl<>(examProgressDtoList, PageRequest.of(pageNumber - 1, pageSize), examStudentList.getTotal());
     }
 }

server/src/main/java/com/qmth/jkserver/service/impl/ExamRoomMonitorInfoServiceImpl.java

@@ -125,7 +125,7 @@ public class ExamRoomMonitorInfoServiceImpl extends ServiceImpl<ExamRoomMonitorI
         }
 //        queryInfos.addCriteria(criteria);
 //        long count = this.mongoTemplate.count(queryInfos, ExamRoomMonitorInfo.class);
-        long count = examRoomMonitorInfoService.count(examRoomMonitorInfoQueryWrapper);
+//        long count = examRoomMonitorInfoService.count(examRoomMonitorInfoQueryWrapper);
 //        queryInfos.limit(pageSize);
 //        queryInfos.skip((curPage - 1) * pageSize);
 //        List<ExamRoomMonitorInfo> examRoomMonitors = this.mongoTemplate.find(queryInfos, ExamRoomMonitorInfo.class);
@@ -148,7 +148,7 @@ public class ExamRoomMonitorInfoServiceImpl extends ServiceImpl<ExamRoomMonitorI
                     examRoomMonitorInfo.getPlaceCode(), examRoomMonitorInfo.getRoomCode(), examRoomMonitorInfo.getCourseCode()));
             infoDtos.add(dto);
         }
-        return new PageImpl<ExamRoomMonitorInfoDto>(infoDtos, PageRequest.of(curPage - 1, pageSize), count);
+        return new PageImpl<ExamRoomMonitorInfoDto>(infoDtos, PageRequest.of(curPage - 1, pageSize), examRoomMonitors.getTotal());
     }
 
 

server/src/main/java/com/qmth/jkserver/service/impl/JkExamPlanServiceImpl.java

@@ -306,7 +306,7 @@ public class JkExamPlanServiceImpl extends ServiceImpl<ExamPlanDao, ExamPlan> im
 //        examPlanQueryWrapper.lambda().orderByDesc(ExamPlan::getCreateTime);
 //        query.with(new Sort(Direction.DESC, "createTime"));
 //        long count = this.mongoTemplate.count(query, ExamPlan.class);
-        long count = examPlanService.count(examPlanQueryWrapper);
+//        long count = examPlanService.count(examPlanQueryWrapper);
 //        query.limit(pageSize);
 //        query.skip((curPage - 1) * pageSize);
 //        List<ExamPlan> examPlanList = this.mongoTemplate.find(query, ExamPlan.class);
@@ -314,7 +314,7 @@ public class JkExamPlanServiceImpl extends ServiceImpl<ExamPlanDao, ExamPlan> im
         IPage<ExamPlan> examPlanIPage = examPlanDao.findByNameByIpage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(curPage, pageSize),
                 searchCondition.getName(), Objects.nonNull(searchCondition.getExamType()) ? searchCondition.getExamType().name() : null, Objects.nonNull(searchCondition.getExamStatus()) ? searchCondition.getExamStatus().name() : null,
                 searchCondition.getStartTime(), searchCondition.getEndTime(), Objects.nonNull(searchCondition.getSchoolId()) && searchCondition.getSchoolId().longValue() > 0 ? searchCondition.getSchoolId() : null);
-        return new PageImpl<ExamPlan>(examPlanIPage.getRecords(), PageRequest.of(curPage - 1, pageSize), count);
+        return new PageImpl<ExamPlan>(examPlanIPage.getRecords(), PageRequest.of(curPage - 1, pageSize), examPlanIPage.getTotal());
     }
 
     /**
@@ -594,39 +594,39 @@ public class JkExamPlanServiceImpl extends ServiceImpl<ExamPlanDao, ExamPlan> im
     public Page<ExamStudentTemp> queryExamStudetnsByPages(ExamStudentDto searchCondition, int curPage, int pageSize) {
 //        Query query = new Query();
 //        Criteria cr = new Criteria();
-        QueryWrapper<ExamStudentTemp> examStudentTempQueryWrapper = new QueryWrapper<>();
-        examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getExamCode, searchCondition.getExamCode())
-                .eq(ExamStudentTemp::getAttachmentId, searchCondition.getAttachmentId());
-//        query.addCriteria(Criteria.where("examCode").is(searchCondition.getExamCode()));
-//        query.addCriteria(Criteria.where("attachmentId").is(searchCondition.getAttachmentId()));
-        if (StringUtils.isNotBlank(searchCondition.getBatchId())) {
-//            query.addCriteria(Criteria.where("batchId").is(searchCondition.getBatchId()));
-            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getBatchId, searchCondition.getBatchId());
-        }
-        if (StringUtils.isNotBlank(searchCondition.getStageId())) {
-//            query.addCriteria(Criteria.where("stageId").is(searchCondition.getStageId()));
-            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getStageId, searchCondition.getStageId());
-        }
-        if (StringUtils.isNotBlank(searchCondition.getPlaceCode())) {
-//            query.addCriteria(Criteria.where("placeCode").is(searchCondition.getPlaceCode()));
-            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getPlaceCode, searchCondition.getPlaceCode());
-        }
-        if (StringUtils.isNotBlank(searchCondition.getRoomCode())) {
-//            query.addCriteria(Criteria.where("roomCode").is(searchCondition.getRoomCode()));
-            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getRoomCode, searchCondition.getRoomCode());
-        }
-        if (StringUtils.isNotBlank(searchCondition.getCourseCode())) {
-//            query.addCriteria(Criteria.where("courseCode").is(searchCondition.getCourseCode()));
-            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getCourseCode, searchCondition.getCourseCode());
-        }
-        if (StringUtils.isNotBlank(searchCondition.getQuerykey())) {
-//            query.addCriteria(cr.orOperator(Criteria.where("name").regex(searchCondition.getQuerykey()),
-//                    Criteria.where("ticketNo").regex(searchCondition.getQuerykey())));
-            examStudentTempQueryWrapper.lambda().and(
-                    i -> i.like(ExamStudentTemp::getName, searchCondition.getQuerykey())
-                            .or().like(ExamStudentTemp::getTicketNo, searchCondition.getQuerykey()));
-        }
-        long count = jkExamStudentTempService.count(examStudentTempQueryWrapper);
+//        QueryWrapper<ExamStudentTemp> examStudentTempQueryWrapper = new QueryWrapper<>();
+//        examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getExamCode, searchCondition.getExamCode())
+//                .eq(ExamStudentTemp::getAttachmentId, searchCondition.getAttachmentId());
+////        query.addCriteria(Criteria.where("examCode").is(searchCondition.getExamCode()));
+////        query.addCriteria(Criteria.where("attachmentId").is(searchCondition.getAttachmentId()));
+//        if (StringUtils.isNotBlank(searchCondition.getBatchId())) {
+////            query.addCriteria(Criteria.where("batchId").is(searchCondition.getBatchId()));
+//            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getBatchId, searchCondition.getBatchId());
+//        }
+//        if (StringUtils.isNotBlank(searchCondition.getStageId())) {
+////            query.addCriteria(Criteria.where("stageId").is(searchCondition.getStageId()));
+//            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getStageId, searchCondition.getStageId());
+//        }
+//        if (StringUtils.isNotBlank(searchCondition.getPlaceCode())) {
+////            query.addCriteria(Criteria.where("placeCode").is(searchCondition.getPlaceCode()));
+//            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getPlaceCode, searchCondition.getPlaceCode());
+//        }
+//        if (StringUtils.isNotBlank(searchCondition.getRoomCode())) {
+////            query.addCriteria(Criteria.where("roomCode").is(searchCondition.getRoomCode()));
+//            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getRoomCode, searchCondition.getRoomCode());
+//        }
+//        if (StringUtils.isNotBlank(searchCondition.getCourseCode())) {
+////            query.addCriteria(Criteria.where("courseCode").is(searchCondition.getCourseCode()));
+//            examStudentTempQueryWrapper.lambda().eq(ExamStudentTemp::getCourseCode, searchCondition.getCourseCode());
+//        }
+//        if (StringUtils.isNotBlank(searchCondition.getQuerykey())) {
+////            query.addCriteria(cr.orOperator(Criteria.where("name").regex(searchCondition.getQuerykey()),
+////                    Criteria.where("ticketNo").regex(searchCondition.getQuerykey())));
+//            examStudentTempQueryWrapper.lambda().and(
+//                    i -> i.like(ExamStudentTemp::getName, searchCondition.getQuerykey())
+//                            .or().like(ExamStudentTemp::getTicketNo, searchCondition.getQuerykey()));
+//        }
+//        long count = jkExamStudentTempService.count(examStudentTempQueryWrapper);
 //        long count = this.mongoTemplate.count(query, ExamStudentTemp.class);
 //        query.limit(pageSize);
 //        query.skip((curPage - 1) * pageSize);
@@ -635,7 +635,7 @@ public class JkExamPlanServiceImpl extends ServiceImpl<ExamPlanDao, ExamPlan> im
         IPage<ExamStudentTemp> examStudentTempIPage = examStudentTempDao.findByExamCode(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(curPage, pageSize),
                 searchCondition.getExamCode(), searchCondition.getAttachmentId(), searchCondition.getBatchId(), searchCondition.getStageId(), searchCondition.getPlaceCode(),
                 searchCondition.getRoomCode(), searchCondition.getCourseCode(), searchCondition.getQuerykey());
-        return new PageImpl<ExamStudentTemp>(examStudentTempIPage.getRecords(), PageRequest.of(curPage - 1, pageSize), count);
+        return new PageImpl<ExamStudentTemp>(examStudentTempIPage.getRecords(), PageRequest.of(curPage - 1, pageSize), examStudentTempIPage.getTotal());
     }
 
     @Override
@@ -653,10 +653,10 @@ public class JkExamPlanServiceImpl extends ServiceImpl<ExamPlanDao, ExamPlan> im
             examRoomTempQueryWrapper.lambda().eq(ExamRoomTemp::getPlaceCode, searchCondition.getPlaceCode());
         }
 //        List<ExamRoomTemp> list = jkExamRoomTempService.list(examRoomTempQueryWrapper);
-        long count = jkExamRoomTempService.count(examRoomTempQueryWrapper);
+//        long count = jkExamRoomTempService.count(examRoomTempQueryWrapper);
         IPage<ExamRoomTemp> examRoomTempIPage = examRoomTempDao.findByExamCode(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(curPage, pageSize),
                 searchCondition.getExamCode(), searchCondition.getAttachmentId(), searchCondition.getPlaceCode());
-        return new PageImpl<ExamRoomTemp>(examRoomTempIPage.getRecords(), PageRequest.of(curPage - 1, pageSize), count);
+        return new PageImpl<ExamRoomTemp>(examRoomTempIPage.getRecords(), PageRequest.of(curPage - 1, pageSize), examRoomTempIPage.getTotal());
     }
 
     @Override

server/src/main/java/com/qmth/jkserver/service/impl/KWServiceImpl.java

@@ -596,8 +596,8 @@ public class KWServiceImpl extends ServiceImpl<KwFileDao, KwFile> implements KWS
             }
         }
 //        long count = mongoTemplate.count(query, ExamRoom.class);
-        long count = examRoomDao.listPageCount(params.getExamCode(), params.getPlaceCode(), params.getPlaceName()
-                , kwKcAlready, kwPaperAlready, kwUncolilingAlready);
+//        long count = examRoomDao.listPageCount(params.getExamCode(), params.getPlaceCode(), params.getPlaceName()
+//                , kwKcAlready, kwPaperAlready, kwUncolilingAlready);
 //        Order order1 = new Order(Direction.ASC, "placeCode");
 //        Order order2 = new Order(Direction.ASC, "roomCode");
 //        Sort sort = new Sort(order1, order2);
@@ -633,7 +633,7 @@ public class KWServiceImpl extends ServiceImpl<KwFileDao, KwFile> implements KWS
             }
             result.add(examKwProgressDto);
         }
-        return new PageImpl<ExamKwProgressDto>(result, PageRequest.of(params.getPageNo() - 1, params.getPageSize()), count);
+        return new PageImpl<ExamKwProgressDto>(result, PageRequest.of(params.getPageNo() - 1, params.getPageSize()), examRooms.getTotal());
     }
 
     @Override

server/src/main/java/com/qmth/jkserver/service/impl/RoomMonitorClientServiceImpl.java

@@ -51,29 +51,29 @@ public class RoomMonitorClientServiceImpl implements RoomMonitorClientService {
     @Override
     public Page<RoomMonitorClientLog> pageQueryLog(RoomMonitorClientParam param, int pageNo, int pageSize) {
 //        Query query = new Query();
-        QueryWrapper<RoomMonitorClientLog> roomMonitorClientLogQueryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(param.getExamCode())) {
-//            query.addCriteria(Criteria.where("examCode").is(param.getExamCode()));
-            roomMonitorClientLogQueryWrapper.lambda().eq(RoomMonitorClientLog::getRoomCode, param.getExamCode());
-        }
-        if (StringUtils.isNotEmpty(param.getPlaceCode())) {
-//            query.addCriteria(Criteria.where("placeCode").is(param.getPlaceCode()));
-            roomMonitorClientLogQueryWrapper.lambda().eq(RoomMonitorClientLog::getPlaceCode, param.getPlaceCode());
-        }
-        if (StringUtils.isNotEmpty(param.getRoomCode())) {
-//            query.addCriteria(Criteria.where("roomCode").is(param.getRoomCode()));
-            roomMonitorClientLogQueryWrapper.lambda().eq(RoomMonitorClientLog::getRoomCode, param.getRoomCode());
-        }
-        if (StringUtils.isNotEmpty(param.getPlaceName())) {
-//            query.addCriteria(Criteria.where("placeName").regex(param.getPlaceName()));
-            roomMonitorClientLogQueryWrapper.lambda().like(RoomMonitorClientLog::getPlaceName, param.getPlaceName());
-        }
-        if (Objects.nonNull(param.isUpload())) {
-//            query.addCriteria(Criteria.where("upload").is(param.isUpload()));
-            roomMonitorClientLogQueryWrapper.lambda().eq(RoomMonitorClientLog::getUpload, param.isUpload());
-        }
-//        long count = this.mongoTemplate.count(query, RoomMonitorClientLog.class);
-        long count = jkRoomMonitorClientLogService.count(roomMonitorClientLogQueryWrapper);
+//        QueryWrapper<RoomMonitorClientLog> roomMonitorClientLogQueryWrapper = new QueryWrapper<>();
+//        if (StringUtils.isNotEmpty(param.getExamCode())) {
+////            query.addCriteria(Criteria.where("examCode").is(param.getExamCode()));
+//            roomMonitorClientLogQueryWrapper.lambda().eq(RoomMonitorClientLog::getRoomCode, param.getExamCode());
+//        }
+//        if (StringUtils.isNotEmpty(param.getPlaceCode())) {
+////            query.addCriteria(Criteria.where("placeCode").is(param.getPlaceCode()));
+//            roomMonitorClientLogQueryWrapper.lambda().eq(RoomMonitorClientLog::getPlaceCode, param.getPlaceCode());
+//        }
+//        if (StringUtils.isNotEmpty(param.getRoomCode())) {
+////            query.addCriteria(Criteria.where("roomCode").is(param.getRoomCode()));
+//            roomMonitorClientLogQueryWrapper.lambda().eq(RoomMonitorClientLog::getRoomCode, param.getRoomCode());
+//        }
+//        if (StringUtils.isNotEmpty(param.getPlaceName())) {
+////            query.addCriteria(Criteria.where("placeName").regex(param.getPlaceName()));
+//            roomMonitorClientLogQueryWrapper.lambda().like(RoomMonitorClientLog::getPlaceName, param.getPlaceName());
+//        }
+//        if (Objects.nonNull(param.isUpload())) {
+////            query.addCriteria(Criteria.where("upload").is(param.isUpload()));
+//            roomMonitorClientLogQueryWrapper.lambda().eq(RoomMonitorClientLog::getUpload, param.isUpload());
+//        }
+////        long count = this.mongoTemplate.count(query, RoomMonitorClientLog.class);
+//        long count = jkRoomMonitorClientLogService.count(roomMonitorClientLogQueryWrapper);
 //        Order order1 = new Order(Direction.ASC, "placeCode");
 //        Order order2 = new Order(Direction.ASC, "roomCode");
 //        Order order3 = new Order(Direction.DESC, "time");
@@ -94,35 +94,35 @@ public class RoomMonitorClientServiceImpl implements RoomMonitorClientService {
 //        list.stream().forEach(m -> m.setExamPlan(examPlan));
         roomMonitorClientLogIPage.getRecords().stream().forEach(m -> m.setExamPlanId(examPlan.getId()));
         PageRequest pageRequest = PageRequest.of(pageNo - 1, pageSize);
-        return new PageImpl<>(roomMonitorClientLogIPage.getRecords(), pageRequest, count);
+        return new PageImpl<>(roomMonitorClientLogIPage.getRecords(), pageRequest, roomMonitorClientLogIPage.getTotal());
     }
 
     @Override
     public Page<RoomMonitorClientData> pageQueryData(RoomMonitorClientParam param, int pageNo, int pageSize) {
 //        Query query = new Query();
-        QueryWrapper<RoomMonitorClientData> roomMonitorClientDataQueryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(param.getExamCode())) {
-//            query.addCriteria(Criteria.where("examCode").is(param.getExamCode()));
-            roomMonitorClientDataQueryWrapper.lambda().eq(RoomMonitorClientData::getExamCode, param.getExamCode());
-        }
-        if (StringUtils.isNotEmpty(param.getPlaceCode())) {
-//            query.addCriteria(Criteria.where("placeCode").is(param.getPlaceCode()));
-            roomMonitorClientDataQueryWrapper.lambda().eq(RoomMonitorClientData::getPlaceCode, param.getPlaceCode());
-        }
-        if (StringUtils.isNotEmpty(param.getRoomCode())) {
-//            query.addCriteria(Criteria.where("roomCode").is(param.getRoomCode()));
-            roomMonitorClientDataQueryWrapper.lambda().eq(RoomMonitorClientData::getRoomCode, param.getRoomCode());
-        }
-        if (StringUtils.isNotEmpty(param.getPlaceName())) {
-//            query.addCriteria(Criteria.where("placeName").regex(param.getPlaceName()));
-            roomMonitorClientDataQueryWrapper.lambda().like(RoomMonitorClientData::getPlaceName, param.getPlaceName());
-        }
-        if (Objects.nonNull(param.isUpload())) {
-//            query.addCriteria(Criteria.where("upload").is(param.isUpload()));
-            roomMonitorClientDataQueryWrapper.lambda().eq(RoomMonitorClientData::getUpload, param.isUpload());
-        }
-//        long count = this.mongoTemplate.count(query, RoomMonitorClientData.class);
-        long count = jkRoomMonitorClientDataService.count(roomMonitorClientDataQueryWrapper);
+//        QueryWrapper<RoomMonitorClientData> roomMonitorClientDataQueryWrapper = new QueryWrapper<>();
+//        if (StringUtils.isNotEmpty(param.getExamCode())) {
+////            query.addCriteria(Criteria.where("examCode").is(param.getExamCode()));
+//            roomMonitorClientDataQueryWrapper.lambda().eq(RoomMonitorClientData::getExamCode, param.getExamCode());
+//        }
+//        if (StringUtils.isNotEmpty(param.getPlaceCode())) {
+////            query.addCriteria(Criteria.where("placeCode").is(param.getPlaceCode()));
+//            roomMonitorClientDataQueryWrapper.lambda().eq(RoomMonitorClientData::getPlaceCode, param.getPlaceCode());
+//        }
+//        if (StringUtils.isNotEmpty(param.getRoomCode())) {
+////            query.addCriteria(Criteria.where("roomCode").is(param.getRoomCode()));
+//            roomMonitorClientDataQueryWrapper.lambda().eq(RoomMonitorClientData::getRoomCode, param.getRoomCode());
+//        }
+//        if (StringUtils.isNotEmpty(param.getPlaceName())) {
+////            query.addCriteria(Criteria.where("placeName").regex(param.getPlaceName()));
+//            roomMonitorClientDataQueryWrapper.lambda().like(RoomMonitorClientData::getPlaceName, param.getPlaceName());
+//        }
+//        if (Objects.nonNull(param.isUpload())) {
+////            query.addCriteria(Criteria.where("upload").is(param.isUpload()));
+//            roomMonitorClientDataQueryWrapper.lambda().eq(RoomMonitorClientData::getUpload, param.isUpload());
+//        }
+////        long count = this.mongoTemplate.count(query, RoomMonitorClientData.class);
+//        long count = jkRoomMonitorClientDataService.count(roomMonitorClientDataQueryWrapper);
 //        Order order1 = new Order(Direction.ASC, "placeCode");
 //        Order order2 = new Order(Direction.ASC, "roomCode");
 //        Order order3 = new Order(Direction.DESC, "time");
@@ -143,6 +143,6 @@ public class RoomMonitorClientServiceImpl implements RoomMonitorClientService {
 //        list.stream().forEach(m -> m.setExamPlan(examPlan));
         roomMonitorClientDataIPage.getRecords().stream().forEach(m -> m.setExamPlanId(examPlan.getId()));
         PageRequest pageRequest = PageRequest.of(pageNo - 1, pageSize);
-        return new PageImpl<>(roomMonitorClientDataIPage.getRecords(), pageRequest, count);
+        return new PageImpl<>(roomMonitorClientDataIPage.getRecords(), pageRequest, roomMonitorClientDataIPage.getTotal());
     }
 }

server/src/main/java/com/qmth/jkserver/service/impl/UserServiceImpl.java

@@ -112,12 +112,12 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
             userQueryWrapper.lambda().and(wrapper -> wrapper.like(User::getUserName, searchCondition.getUserName()).or().like(User::getRealName, searchCondition.getUserName()));
         }
 //        long count = this.mongoTemplate.count(query, User.class);
-        long count = this.count(userQueryWrapper);
+//        long count = this.count(userQueryWrapper);
 //        query.limit(pageSize);
 //        query.skip((curPage - 1) * pageSize);
 //        List<User> examStudentList = this.mongoTemplate.find(query, User.class);
         IPage<User> examStudentList = userDao.findByUserNameByPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(curPage, pageSize), searchCondition.getUserName());
-        return new PageImpl<User>(examStudentList.getRecords(), PageRequest.of(curPage - 1, pageSize), count);
+        return new PageImpl<User>(examStudentList.getRecords(), PageRequest.of(curPage - 1, pageSize), examStudentList.getTotal());
     }
 
     @Override