From 4ae056d9ee53e453ff0a8b631fb3bbcd77822e41 Mon Sep 17 00:00:00 2001
From: tortoise <2891138827@qq.com>
Date: Sat, 10 Aug 2024 00:42:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=94=B3=E8=AF=B7=E6=92=A4=E9=94=80=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95,=E7=AE=A1=E7=90=86=E5=91=98=E6=92=A4=E9=94=80?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  5 +--
 .../suyiiyii/sims/entity/RevokeRequest.java   | 31 +++++++++++++++++++
 .../suyiiyii/sims/entity/RevokedRecord.java   | 31 +++++++++++++++++++
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/top/suyiiyii/sims/entity/RevokeRequest.java
 create mode 100644 src/main/java/top/suyiiyii/sims/entity/RevokedRecord.java

diff --git a/README.md b/README.md
index 82a2cce..5ca413b 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,10 @@ Super Invincible Management System
 8. require review: 请求review
 9. merge: 合并 PR
 10. delete: 删除分支
-
+ 
 1. 基础rbac的五张表: user, role, permission, user_role, role_permission
 2. 然后奖惩记录这张表，通过用户id来查到，里面有相应的记录， 有一个 奖惩类别ID是对应到奖惩类型去的
 3. 有一个上下级关系表，想着是用户明确查上下级就可以用查，
 4. 然后就是附件，是通过奖惩记录的id来存一个路径，然后前端通过这个路径来获取附件,同样的上传的时候也是
-5. 通知是这样子想的，有上传的人的id和接收的人的id，然后有状态（已读，未读），然后有附件的路径，然后有通知内容，然后有通知时间，然后有通知类型（奖惩，通知）
\ No newline at end of file
+5. 通知是这样子想的，有上传的人的id和接收的人的id，然后有状态（已读，未读），然后有附件的路径，然后有通知内容，然后有通知时间，然后有通知类型（奖惩，通知）
+6. RevokeRequest:  存普通成员提出的撤销申请,跟踪申请状态 RevokedRecord: 存储管理员对奖惩记录的撤销信息，包括撤销原因
\ No newline at end of file
diff --git a/src/main/java/top/suyiiyii/sims/entity/RevokeRequest.java b/src/main/java/top/suyiiyii/sims/entity/RevokeRequest.java
new file mode 100644
index 0000000..66b8b34
--- /dev/null
+++ b/src/main/java/top/suyiiyii/sims/entity/RevokeRequest.java
@@ -0,0 +1,31 @@
+package top.suyiiyii.sims.entity;
+
+import com.tangzc.mpe.autotable.annotation.Table;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author tortoise
+ * @Date 2024/8/10 0:31
+ * @PackageName:top.suyiiyii.sims.entity
+ * @ClassName: RevokeRequest
+ * @Description:  存储普通成员提出的奖惩撤销申请，并跟踪申请状态
+ * @Version 1.0
+ */
+@Data
+@Table
+public class RevokeRequest {
+
+    private Integer id;
+    private Integer recordId;
+    private Integer userId;
+    private String reason;
+    private LocalDateTime requestTime;
+    private String status;
+    //处理时间
+    private LocalDateTime handleTime;
+    private String adminRemark;
+
+}
+
diff --git a/src/main/java/top/suyiiyii/sims/entity/RevokedRecord.java b/src/main/java/top/suyiiyii/sims/entity/RevokedRecord.java
new file mode 100644
index 0000000..4dc5b2e
--- /dev/null
+++ b/src/main/java/top/suyiiyii/sims/entity/RevokedRecord.java
@@ -0,0 +1,31 @@
+package top.suyiiyii.sims.entity;
+
+import com.tangzc.mpe.autotable.annotation.Table;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author tortoise
+ * @Date 2024/8/10 0:34
+ * @PackageName:top.suyiiyii.sims.entity
+ * @ClassName: RevokedRecord
+ * @Description:  存储管理员对奖惩记录的撤销信息，包括撤销原因
+ * @Version 1.0
+ */
+@Data
+@Table
+public class RevokedRecord {
+
+    private Integer id;
+    // 被撤销的奖惩记录ID
+    private Integer recordId;
+    // 撤销操作的管理员ID
+    private Integer adminId;
+    // 撤销原因
+    private String reason;
+    // 撤销时间
+    private LocalDateTime revokedTime;
+
+}
+