From 0f17de2da3b49a27a89ec7c897f52a9386312585 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 22 二月 2025 11:04:56 +0800
Subject: [PATCH] Merge branch 'dev' into dev_dz
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
index aecac08..840cd80 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
@@ -13,10 +13,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -39,7 +36,7 @@
private ManageDocumentIssueRecycleService manageDocumentIssueRecycleService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢鍙戞斁鍥炴敹")
- @PostMapping("/pageManageDocumentIssueRecycle")
+ @GetMapping("/pageManageDocumentIssueRecycle")
public Result pageManageDocumentIssueRecycle(Page page,ManageDocumentIssueRecycleDto manageDocumentIssueRecycleDto) throws Exception {
return Result.success(manageDocumentIssueRecycleService.pageManageDocumentIssueRecycle(page, manageDocumentIssueRecycleDto));
}
@@ -51,14 +48,14 @@
}
@ApiOperation(value = "鍒犻櫎鏂囦欢鍙戞斁鍥炴敹")
- @PostMapping("/delManageDocumentIssueRecycle")
+ @DeleteMapping("/delManageDocumentIssueRecycle")
public Result delManageDocumentIssueRecycle(Long id){
return Result.success(manageDocumentIssueRecycleService.delManageDocumentIssueRecycle(id));
}
@ApiOperation(value = "鏌ョ湅鏂囦欢鍙戞斁鍥炴敹")
- @PostMapping("/getManageDocumentIssueRecycle")
+ @GetMapping("/getManageDocumentIssueRecycle")
public Result getManageDocumentIssueRecycle(Long id){
return Result.success(manageDocumentIssueRecycleService.getManageDocumentIssueRecycle(id));
}
@@ -73,12 +70,12 @@
@ApiOperation(value = "瀹℃牳鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/checkManageDocumentIssueRecycle")
- public Result checkManageDocumentIssueRecycle(Integer id,String documentState){
- return Result.success(manageDocumentIssueRecycleService.checkManageDocumentIssueRecycle(id,documentState));
+ public Result checkManageDocumentIssueRecycle(@RequestBody ManageDocumentIssueRecycle manageDocumentIssueRecycle){
+ return Result.success(manageDocumentIssueRecycleService.checkManageDocumentIssueRecycle(manageDocumentIssueRecycle.getId(),manageDocumentIssueRecycle.getDocumentState()));
}
@ApiOperation(value = "瀵煎嚭鏂囦欢鍙戞斁鍥炴敹")
- @PostMapping("/exportManageDocumentIssueRecycle")
+ @GetMapping("/exportManageDocumentIssueRecycle")
public void exportManageDocumentIssueRecycle(ManageDocumentIssueRecycleDto manageDocumentIssueRecycleDto, HttpServletResponse response) throws Exception {
manageDocumentIssueRecycleService.exportManageDocumentIssueRecycle(manageDocumentIssueRecycleDto,response);
}
--
Gitblit v1.9.3