diff --git a/src/main/java/top/suyiiyii/sims/controller/RevokedController.java b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java index ec67aa7..4079354 100644 --- a/src/main/java/top/suyiiyii/sims/controller/RevokedController.java +++ b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java @@ -106,13 +106,13 @@ public class RevokedController { @AuthAccess(allowRoles = {"admin"}) @Operation(summary = "撤销单个奖惩记录") @DeleteMapping("/admin/records/{id}") - public Result adminDeleteRecord(@PathVariable Integer id, String reason, HttpServletRequest request) { + public Result adminDeleteRecord(@PathVariable Integer id, String reason,String remark, 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); + recordService.revokeUpdate(id,reason,remark,userId); return Result.msg("撤销成功"); } diff --git a/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java b/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java index 8af067b..0f3721e 100644 --- a/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java +++ b/src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java @@ -85,8 +85,8 @@ public interface RecordMapper { Integer getCategoryIdById(Integer id); @Update("UPDATE record SET is_revoked=#{isRevoked},operator_user_id=#{userId},revoke_remark = #{adminRemark}, revoke_reason = #{reason}, lsat_update_time = #{handleTime} WHERE id = #{id}") 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); +@Update("UPDATE record SET is_revoked=#{isRevoked},operator_user_id=#{userId},revoke_remark = #{remark}, revoke_reason = #{reason} WHERE id = #{id}") + void Rupdate(Integer id,Boolean isRevoked,String reason,String remark , String userId); @Select("SELECT * FROM record WHERE category_id = #{i} LIMIT #{page},#{size}") List 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 37f9906..d77d27d 100644 --- a/src/main/java/top/suyiiyii/sims/service/RecordService.java +++ b/src/main/java/top/suyiiyii/sims/service/RecordService.java @@ -114,10 +114,9 @@ public class RecordService { recordMapper.update(id, isRevoked,userId, adminRemark, reason, handleTime); } - public void revokeUpdate(Integer id, String reason,String userId) { - String revokeReason="申请撤销"; + public void revokeUpdate(Integer id, String reason,String remark,String userId) { Boolean isRevoked=true; - recordMapper.Rupdate(id, reason,isRevoked,revokeReason,userId); + recordMapper.Rupdate(id, isRevoked,reason,remark,userId); } public Integer getCategoryIdById(Integer id) {