From 92094134832c46aef51b0a858260afed23e1b766 Mon Sep 17 00:00:00 2001
From: tortoise <2891138827@qq.com>
Date: Sun, 1 Sep 2024 15:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sims/controller/RecordController.java       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
index 625e3ff..c6450a7 100644
--- a/src/main/java/top/suyiiyii/sims/controller/RecordController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
@@ -3,6 +3,7 @@ package top.suyiiyii.sims.controller;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
+import lombok.Data;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -120,13 +121,16 @@ RecordController {
     public Result<List<RecordDto>> searchRecords(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size,
-            String username,Integer studentId, String userGroup, String grade,String roleName) {
+            SearchRequest searchRequest) {
+
         Integer s1;
         List<Integer> studentIds = new ArrayList<>();
         List<Record> records=new ArrayList<>();
+       Integer studentId = searchRequest.getStudentId();
         if(studentId!=null) {
             studentIds.add(studentId);
         }
+       String roleName = searchRequest.getRoleName();
         if(roleName!="") {
             //rolename查用户id
             Integer userId = roleService.getIdByrolename(roleName);
@@ -134,13 +138,14 @@ RecordController {
           s1 = userService.getStudentIdByUserId(userId);
             studentIds.add(s1);
         }
+       String username = searchRequest.getUsername();
         if(username!="") {
             //username查用户StudentId
             s1= roleService.getStudentIdByUsername(username);
             studentIds.add(s1);
         }
         for (Integer Sid : studentIds) {
-            records.addAll(recordService.getRecordsLike(page,size,Sid,userGroup,grade));
+            records.addAll(recordService.getRecordsLike(page,size,Sid,searchRequest.getUserGroup(),searchRequest.getGrade()));
         }
         List<RecordDto> RecordDtos = new ArrayList<>();
         for (Record record : records) {
@@ -229,4 +234,12 @@ RecordController {
         }
         return Result.success(RecordDtos);
     }
+    @Data
+    public static class SearchRequest {
+        private String username;
+        private Integer studentId;
+        private String grade;
+        private String userGroup;
+        private String roleName;
+    }
 }