From 8dc28c815eb0acdb5af82c2667eec45efd0507c5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 18 三月 2025 09:34:46 +0800
Subject: [PATCH] 车间绑定调整
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
index d970e87..5e94d64 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
@@ -12,10 +12,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 org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -40,7 +37,7 @@
private ManageRecordCancelService manageRecordCancelService;
@ApiOperation(value = "鍒嗛〉鏌ヨ浣滃簾鏂囦欢閿�姣佽褰�")
- @PostMapping("/pageManageRecordCancel")
+ @GetMapping("/pageManageRecordCancel")
public Result pageManageRecordCancel(Page page,ManageRecordCancel manageRecordCancel) throws Exception {
return Result.success(manageRecordCancelService.pageManageRecordCancel(page, manageRecordCancel));
}
@@ -60,19 +57,21 @@
}
@ApiOperation(value = "鍒犻櫎浣滃簾鏂囦欢閿�姣佽褰�")
- @PostMapping("/delManageRecordCancel")
+ @DeleteMapping("/delManageRecordCancel")
public Result delManageRecordCancel(Integer id){
return Result.success(manageRecordCancelService.removeById(id));
}
@ApiOperation(value = "鎵瑰噯浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/ratifyManageRecordCancel")
- public Result ratifyManageRecordCancel(Integer id,String ratifyState){
+ public Result ratifyManageRecordCancel(@RequestBody Map<String, Object> param){
+ Integer id = (Integer) param.get("id");
+ String ratifyState = (String) param.get("ratifyState");
return Result.success(manageRecordCancelService.ratifyManageRecordCancel(id,ratifyState));
}
@ApiOperation(value = "瀵煎嚭浣滃簾鏂囦欢閿�姣佽褰�")
- @PostMapping("/exportOutManageRecordCancel")
+ @GetMapping("/exportOutManageRecordCancel")
public Result exportOutManageRecordCancel(ManageRecordCancel manageRecordCancel, HttpServletResponse response) throws Exception {
return Result.success(manageRecordCancelService.exportOutManageRecordCancel(manageRecordCancel,response));
}
@@ -80,9 +79,10 @@
@ApiOperation(value = "瀵煎叆浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/exportInManageRecordCancel")
public Result exportInManageRecordCancel(MultipartFile file){
- return Result.success(manageRecordCancelService.exportInManageRecordCancel(file));
+ try {
+ return Result.success(manageRecordCancelService.exportInManageRecordCancel(file));
+ }catch (Exception e){
+ return Result.fail(e.getMessage());
+ }
}
-
-
-
}
--
Gitblit v1.9.3