diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java index 981dc5f..c07b77d 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java @@ -47,9 +47,11 @@ public class MemberController { public ResultEntity> pagedListMembers(@ApiParam("班级名称") String className, @ApiParam("实训名称") String trainingName, @ApiParam("评分状态") Integer markStatus, - @ApiParam("查询关键字:学号或学生名称") String keyword) { + @ApiParam("查询关键字:学号或学生名称") String keyword, + @ApiParam("分页索引:{0}为第一页") @RequestParam(required = false) Integer index, + @ApiParam("页量") @RequestParam(required = false) Integer size) { - PageInfo pageInfo = memberService.pagedListMembers(className, trainingName, markStatus, keyword); + PageInfo pageInfo = memberService.pagedListMembers(className, trainingName, markStatus, keyword, index, size); if(!pageInfo.getList().isEmpty()){ for(MemberVO vo: pageInfo.getList()){ Training training = trainingService.findById(vo.getTrainingId()); diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java b/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java index b4d79e8..f740e6d 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java @@ -1,5 +1,6 @@ package com.sztzjy.forex.trading_trading.service; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sztzjy.forex.trading_trading.dto.MemberVO; import com.sztzjy.forex.trading_trading.entity.Member; @@ -62,7 +63,9 @@ public class MemberService { public PageInfo pagedListMembers(String className, String trainingName, Integer markStatus, - String keyword) { + String keyword, + Integer page, + Integer size) { MemberExample example = new MemberExample(); MemberExample.Criteria criteria = example.createCriteria(); if (StringUtils.hasText(className)) { @@ -80,6 +83,7 @@ public class MemberService { orCriteria.andStudentNumberEqualTo("%" + keyword + "%"); example.or(orCriteria); } + PageHelper.startPage(page, size); return new PageInfo<>(memberMapper.pagedListMembers(example)); }