From 17c3e251f2adf11124e009fa77157990af0d7c37 Mon Sep 17 00:00:00 2001
From: tortoise <2891138827@qq.com>
Date: Mon, 9 Sep 2024 10:48:39 +0800
Subject: [PATCH] cherry

---
 .../suyiiyii/sims/controller/RecordController.java    |  1 +
 .../suyiiyii/sims/controller/RevokedController.java   |  3 +++
 .../java/top/suyiiyii/sims/service/RecordService.java | 11 +++++++++++
 .../top/suyiiyii/sims/service/RevokedService.java     |  7 ++++---
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
index 36e0a70..747182b 100644
--- a/src/main/java/top/suyiiyii/sims/controller/RecordController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
@@ -101,6 +101,7 @@ RecordController {
     }
 
 
+
     @AuthAccess(allowRoles = {"admin"})
     @Operation(summary = "添加奖惩记录")
     @PostMapping("/admin/record")
diff --git a/src/main/java/top/suyiiyii/sims/controller/RevokedController.java b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java
index d84db4c..1b91524 100644
--- a/src/main/java/top/suyiiyii/sims/controller/RevokedController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java
@@ -3,12 +3,14 @@ package top.suyiiyii.sims.controller;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import top.suyiiyii.sims.common.AuthAccess;
+import top.suyiiyii.sims.common.JwtInterceptor;
 import top.suyiiyii.sims.common.Result;
 import top.suyiiyii.sims.dto.CommonResponse;
 import top.suyiiyii.sims.dto.RecordDto;
@@ -45,6 +47,7 @@ public class RevokedController {
     CategoryService categoryService;
     @Autowired
     RecordService recordService;
+
     //TODO 普通成员向管理员申请撤销
     @AuthAccess(allowRoles = {"user"})
     @Operation(summary = "成员申请撤销")
diff --git a/src/main/java/top/suyiiyii/sims/service/RecordService.java b/src/main/java/top/suyiiyii/sims/service/RecordService.java
index 710df5f..82c2266 100644
--- a/src/main/java/top/suyiiyii/sims/service/RecordService.java
+++ b/src/main/java/top/suyiiyii/sims/service/RecordService.java
@@ -123,4 +123,15 @@ public class RecordService {
     public Integer getCategoryIdById(Integer  id) {
         return recordMapper.getCategoryIdById(id);
     }
+
+    public void update(Integer id, String userId, String adminRemark, String reason, Long handleTime) {
+        Boolean isRevoked=true;
+        recordMapper.update(id, isRevoked,userId, adminRemark, reason, handleTime);
+    }
+
+    public void revokeUpdate(Integer id, String reason,String userId) {
+        String revokeReason="申请撤销";
+        Boolean isRevoked=true;
+        recordMapper.Rupdate(id, reason,isRevoked,revokeReason,userId);
+    }
 }
diff --git a/src/main/java/top/suyiiyii/sims/service/RevokedService.java b/src/main/java/top/suyiiyii/sims/service/RevokedService.java
index 9aca15f..668c834 100644
--- a/src/main/java/top/suyiiyii/sims/service/RevokedService.java
+++ b/src/main/java/top/suyiiyii/sims/service/RevokedService.java
@@ -36,11 +36,12 @@ public class RevokedService {
     }
 
 
-
-
-
     public void updateRevokeRequest(Integer id, String status, String adminRemark, String reason, Long handleTime) {
 
         mpRevRequestMapper.update(id, status, adminRemark, reason, handleTime);
     }
+
+    public void addRevokedRecord(Integer id, String userId, String reason, Long handleTime) {
+        mpRevRecord.addRevokedRecord(id, userId, reason, handleTime);
+    }
 }