From 58219a84c8923b81936b0d051add516e846a2739 Mon Sep 17 00:00:00 2001
From: tortoise <2891138827@qq.com>
Date: Mon, 9 Sep 2024 11:39:28 +0800
Subject: [PATCH] cherry

---
 .../sims/controller/RevokedController.java    | 22 ++++++++++++++++---
 .../suyiiyii/sims/service/RecordService.java  | 10 ---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/java/top/suyiiyii/sims/controller/RevokedController.java b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java
index 1b91524..ec67aa7 100644
--- a/src/main/java/top/suyiiyii/sims/controller/RevokedController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java
@@ -86,7 +86,8 @@ public class RevokedController {
     @AuthAccess(allowRoles = {"admin"})
     @Operation(summary = "管理员处理撤销申请")
     @PutMapping("/{id}")
-    public Result<CommonResponse> revoked( @PathVariable Integer id,RevokedRequest revokedRequest) {
+    public Result<CommonResponse> revoked(@PathVariable Integer id, RevokedRequest revokedRequest, HttpServletRequest request) {
+        String userId = String.valueOf(JwtInterceptor.getUserIdFromReq(request));
         if(revokedRequest.getAdminRemark().isBlank()) {
             throw new ServiceException("撤销备注不能为空");
         }
@@ -97,10 +98,25 @@ public class RevokedController {
         revokedService.updateRevokeRequest(id,
                 revokedRequest.getStatus(),revokedRequest.getAdminRemark(),
                 revokedRequest.getReason(),revokedRequest.getHandleTime());
-//TODO 要加到记录里面去
-        return Result.success(CommonResponse.factory("申请成功"));
+            //TODO 要加到记录里面去
+            revokedService.addRevokedRecord(id,userId,revokedRequest.getReason(),revokedRequest.getHandleTime());
 
+        return Result.success(CommonResponse.factory("申请成功"));
     }
+    @AuthAccess(allowRoles = {"admin"})
+    @Operation(summary = "撤销单个奖惩记录")
+    @DeleteMapping("/admin/records/{id}")
+    public Result<CommonResponse> adminDeleteRecord(@PathVariable Integer id, String reason, HttpServletRequest request) {
+        Integer i = recordService.IsRecord(id);
+        String userId = String.valueOf(JwtInterceptor.getUserIdFromReq(request));
+        if(i==null) {
+            throw new RuntimeException("该记录不存在");
+        }
+        recordService.revokeUpdate(id,reason,userId);
+        return Result.msg("撤销成功");
+    }
+
+
     @Data
     public static class Request {
         private Integer userId;
diff --git a/src/main/java/top/suyiiyii/sims/service/RecordService.java b/src/main/java/top/suyiiyii/sims/service/RecordService.java
index 82c2266..35dfd07 100644
--- a/src/main/java/top/suyiiyii/sims/service/RecordService.java
+++ b/src/main/java/top/suyiiyii/sims/service/RecordService.java
@@ -124,14 +124,4 @@ public class RecordService {
         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);
-    }
 }