From 352186008ac190dfd61bc57353323cebf8811117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Wed, 26 Jul 2023 10:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MemberController.java           |  8 ++++++--
 .../trading_trading/service/MemberService.java | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 4 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 03626cc..6a85ab8 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
@@ -114,8 +114,12 @@ public class MemberController {
     @Permission(codes = PermissionType.TRAINING_MANAGEMENT_SEARCH)
     @ApiOperation("根据实训任务id获取成员列表")
     @GetMapping("listMembersByTrainingId")
-    public ResultEntity<PageInfo<Member>> listMembersByTrainingId(@RequestParam String trainingId, @RequestParam Integer index, @RequestParam Integer size) {
-        PageInfo<Member> members = memberService.pageListMemberByTrainingId(trainingId, index, size);
+    public ResultEntity<PageInfo<Member>> listMembersByTrainingId(@RequestParam String trainingId,
+                                                                  @ApiParam("班级id") Integer classId,
+                                                                  @ApiParam("查询关键字：学号和姓名")String keyword,
+                                                                  @RequestParam Integer index,
+                                                                  @RequestParam Integer size) {
+        PageInfo<Member> members = memberService.pageListMemberByTrainingId(trainingId, classId,keyword,index, size);
         return new ResultEntity<PageInfo<Member>>(members);
     }
 }
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 5b35a93..1dcf4f4 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
@@ -111,10 +111,24 @@ public class MemberService {
     }
 
 
-    public PageInfo<Member> pageListMemberByTrainingId(String trainingId, Integer index, Integer size) {
+    public PageInfo<Member> pageListMemberByTrainingId(String trainingId,
+                                                       Integer classId,
+                                                       String keyword,
+                                                       Integer index,
+                                                       Integer size) {
         MemberExample example = new MemberExample();
         MemberExample.Criteria criteria = example.createCriteria();
         criteria.andTrainingIdEqualTo(trainingId);
+        if (classId!=null&&classId>0) {
+           criteria.andClassIdEqualTo(classId);
+        }
+        if(StringUtils.hasText(keyword)){
+            criteria.andNameLike("%"+keyword+"%");
+            MemberExample.Criteria orCriteria = example.createCriteria();
+            orCriteria.andStudentNumberEqualTo("%"+keyword+"%");
+            example.or(orCriteria);
+        }
+
         example.setOrderByClause("stu_rank ASC");
         PageHelper.startPage(index, size);
         return new PageInfo<>(memberMapper.selectByExample(example));
@@ -195,7 +209,7 @@ public class MemberService {
         return memberMapper.selectTrainingListByClassId(Integer.valueOf(trainingId));
     }
 
-    public List<Map<String,Object>> selectAllTrainingList(int schoolId){
+    public List<Map<String, Object>> selectAllTrainingList(int schoolId) {
         return memberMapper.selectAllTrainingList(schoolId);
     }
 }