From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java
index 064997b..d371601 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.manager.entity.ReviseLog;
import com.vincent.rsf.server.manager.service.ReviseLogService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -67,6 +68,7 @@
return R.ok("Save Success").add(reviseLog);
}
+
@PreAuthorize("hasAuthority('manager:locRevise:update')")
@OperationLog("Update 搴撲綅璋冩暣鍘嗗彶")
@PostMapping("/reviseLog/update")
@@ -89,6 +91,16 @@
return R.ok().add(reviseLogService.reviseLoc(reviseLog, getLoginUserId()));
}
+ @PreAuthorize("hasAuthority('manager:locRevise:update')")
+ @PostMapping("/reviseLog/complete/{id}")
+ @ApiOperation("纭璋冩暣搴撳瓨")
+ public R completeTran(@PathVariable("id") Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return reviseLogService.complete(id, getLoginUserId());
+ }
+
@PreAuthorize("hasAuthority('manager:locRevise:remove')")
@OperationLog("Delete 搴撲綅璋冩暣鍘嗗彶")
@PostMapping("/reviseLog/remove/{ids}")
--
Gitblit v1.9.1