ssyg/SIMS
2
0
Fork 0
mirror of https://github.com/suyiiyii/SIMS.git synced 2025-05-31 11:46:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cherry

Browse Source
This commit is contained in:
tortoise 2024-09-09 11:39:28 +08:00
parent 17c3e251f2
commit 58219a84c8
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/top/suyiiyii/sims/controller/RevokedController.java
View File

@ -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;

10
src/main/java/top/suyiiyii/sims/service/RecordService.java
View File

@ -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);
}
}