From 37205370f1201533b7f82b8e16381ffb008a7f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Fri, 14 Jul 2023 15:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forex/trading_trading/controller/MemberController.java  | 6 ++++--
 .../sztzjy/forex/trading_trading/service/MemberService.java | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

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<PageInfo<MemberVO>> 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<MemberVO> pageInfo = memberService.pagedListMembers(className, trainingName, markStatus, keyword);
+        PageInfo<MemberVO> 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<MemberVO> 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));
     }