From a67a6c77dfa61640a902813f7d96e20cdc757ac9 Mon Sep 17 00:00:00 2001
From: tortoise <2891138827@qq.com>
Date: Mon, 9 Sep 2024 20:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sims/controller/RecordController.java     | 32 ++++++-------------
 .../suyiiyii/sims/mapper/RecordMapper.java    |  2 ++
 .../suyiiyii/sims/service/RecordService.java  |  3 ++
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
index 747182b..f7cd470 100644
--- a/src/main/java/top/suyiiyii/sims/controller/RecordController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
@@ -125,7 +125,6 @@ RecordController {
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size,
             SearchRequest searchRequest) {
-
         Integer s1;
         List<Integer> studentIds = new ArrayList<>();
         List<Record> records=new ArrayList<>();
@@ -173,16 +172,10 @@ RecordController {
             return Result.error("请选择正确奖惩类别");
         }
         List<Integer> idByCategoryName = categoryService.getIdByCategoryName(categoryName);
-        for (Integer i : idByCategoryName) {
-            List<Integer> sid = recordService.getSidByCategoryId(i);
-            studentIds.addAll(sid);
-        }
         List<Record> records=new ArrayList<>();
-        HashSet<Integer> studentIds1= new HashSet<>(studentIds);
-        for (Integer Sid : studentIds1) {
-            if(Sid!=null){
-                records.addAll(recordService.getRecordsById(page,size,Sid));
-            }
+        for (Integer i : idByCategoryName) {
+            List<Record> recordsByCategoryId = recordService.getRecordsByCategoryId(page, size, i);
+            records.addAll(recordsByCategoryId);
         }
         List<RecordDto> RecordDtos = new ArrayList<>();
         for (Record record : records) {
@@ -202,25 +195,20 @@ RecordController {
             @RequestParam(defaultValue = "10") int size,
             String categoryName,HttpServletRequest request) {
         int userId = JwtInterceptor.getUserIdFromReq(request);
-        List<Integer> studentIds = new ArrayList<>();
         //CategoryName不是奖励或者惩罚
         if (!categoryName.equals("奖励")
                 && !categoryName.equals("惩罚")) {
             return Result.error("请选择正确奖惩类别");
         }
+        Integer studentId = userService.getStudentIdByUserId(userId);
         List<Integer> idByCategoryName = categoryService.getIdByCategoryName(categoryName);
-        for (Integer i : idByCategoryName) {
-            List<Integer> sid = recordService.getSidByCategoryId(i);
-            if(sid!=null) {
-                studentIds.addAll(sid);
-            }
-        }
         List<Record> records=new ArrayList<>();
-        HashSet<Integer> studentIds1= new HashSet<>(studentIds);
-        for (Integer Sid : studentIds1) {
-            Integer studentId1 =userService.getStudentIdByUserId(userId);
-            if (studentId1!= null && studentId1.equals(Sid)) {
-                records.addAll(recordService.getRecordsById(page, size, Sid));
+        for (Integer i : idByCategoryName) {
+            List<Record> records1 = recordService.getRecordsByCategoryId(page, size, i);
+            for (Record record : records1) {
+                if (record.getStudentId()==studentId) {
+                    records.add(record);
+                }
             }
         }
         List<RecordDto> RecordDtos = new ArrayList<>();
diff --git a/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java b/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java
index 5c56ab4..8af067b 100644
--- a/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java
+++ b/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java
@@ -87,4 +87,6 @@ public interface RecordMapper {
     void update(Integer id ,Boolean isRevoked,String userId, String adminRemark, String reason, Long handleTime);
 @Update("UPDATE record SET is_revoked=#{isRevoked},operator_user_id=#{userId},revoke_remark = #{reason}, revoke_reason = #{revokeReason} WHERE id = #{id}")
     void Rupdate(Integer id, String reason, Boolean isRevoked,String revokeReason, String userId);
+@Select("SELECT * FROM record WHERE category_id = #{i} LIMIT #{page},#{size}")
+    List<Record> getRecordsByCategoryId(int page, int size, Integer i);
 }
diff --git a/src/main/java/top/suyiiyii/sims/service/RecordService.java b/src/main/java/top/suyiiyii/sims/service/RecordService.java
index 35dfd07..37f9906 100644
--- a/src/main/java/top/suyiiyii/sims/service/RecordService.java
+++ b/src/main/java/top/suyiiyii/sims/service/RecordService.java
@@ -124,4 +124,7 @@ public class RecordService {
         return recordMapper.getCategoryIdById(id);
     }
 
+    public List<Record> getRecordsByCategoryId(int page, int size, Integer i) {
+        return recordMapper.getRecordsByCategoryId(page, size, i);
+    }
 }