From 2670e932c49d6541ff796107d8ab13a732fcde0d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 22 二月 2025 10:17:52 +0800
Subject: [PATCH] 资源要求-8.文件发放与回收修改

---
 cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java |   45 +++++++++++++++++++--------------------------
 1 files changed, 19 insertions(+), 26 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 41b164a..cf573fa 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
@@ -1,18 +1,18 @@
 package com.ruoyi.manage.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
 import com.ruoyi.manage.pojo.ManageRecordCancel;
 import com.ruoyi.manage.service.ManageRecordCancelService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -28,24 +28,20 @@
  * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
  * @since 2024-11-13 01:27:22
  */
+@Api(tags = "璁板綍鐨勬帶鍒�")
 @RestController
 @RequestMapping("/manageRecordCancel")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
 public class ManageRecordCancelController {
 
     @Resource
     private ManageRecordCancelService manageRecordCancelService;
 
-    @ValueClassify(value = "璁板綍鐨勬帶鍒�")
     @ApiOperation(value = "鍒嗛〉鏌ヨ浣滃簾鏂囦欢閿�姣佽褰�")
-    @PostMapping("/pageManageRecordCancel")
-    public Result pageManageRecordCancel(@RequestBody Map<String, Object> data) throws Exception {
-        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-        ManageRecordCancel manageRecordCancel = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordCancel.class);
+    @GetMapping("/pageManageRecordCancel")
+    public Result pageManageRecordCancel(Page page,ManageRecordCancel manageRecordCancel) throws Exception {
         return Result.success(manageRecordCancelService.pageManageRecordCancel(page, manageRecordCancel));
     }
 
-    @ValueClassify(value = "璁板綍鐨勬帶鍒�")
     @ApiOperation(value = "鏂板浣滃簾鏂囦欢閿�姣佽褰�")
     @PostMapping("/addManageRecordCancel")
     public Result addManageRecordCancel(@RequestBody ManageRecordCancel manageRecordCancel){
@@ -53,36 +49,33 @@
         return Result.success(manageRecordCancelService.save(manageRecordCancel));
     }
 
-    @ValueAuth
+
     @ApiOperation(value = "缂栬緫浣滃簾鏂囦欢閿�姣佽褰�")
     @PostMapping("/doManageRecordCancel")
     public Result doManageRecordCancel(@RequestBody ManageRecordCancel manageRecordCancel){
         return Result.success(manageRecordCancelService.updateById(manageRecordCancel));
     }
 
-    @ValueClassify(value = "璁板綍鐨勬帶鍒�")
     @ApiOperation(value = "鍒犻櫎浣滃簾鏂囦欢閿�姣佽褰�")
-    @PostMapping("/delManageRecordCancel")
+    @DeleteMapping("/delManageRecordCancel")
     public Result delManageRecordCancel(Integer id){
         return Result.success(manageRecordCancelService.removeById(id));
     }
 
-    @ValueClassify(value = "璁板綍鐨勬帶鍒�")
     @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));
     }
 
-    @ValueClassify(value = "璁板綍鐨勬帶鍒�")
     @ApiOperation(value = "瀵煎嚭浣滃簾鏂囦欢閿�姣佽褰�")
-    @PostMapping("/exportOutManageRecordCancel")
-    public Result exportOutManageRecordCancel(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
-        ManageRecordCancel manageRecordCancel = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordCancel.class);
+    @GetMapping("/exportOutManageRecordCancel")
+    public Result exportOutManageRecordCancel(ManageRecordCancel manageRecordCancel, HttpServletResponse response) throws Exception {
         return Result.success(manageRecordCancelService.exportOutManageRecordCancel(manageRecordCancel,response));
     }
 
-    @ValueClassify(value = "璁板綍鐨勬帶鍒�")
     @ApiOperation(value = "瀵煎叆浣滃簾鏂囦欢閿�姣佽褰�")
     @PostMapping("/exportInManageRecordCancel")
     public Result exportInManageRecordCancel(MultipartFile file){

--
Gitblit v1.9.3