Merge branch 'dev' into dev_dz

zhuo

2025-02-22 0f17de2da3b49a27a89ec7c897f52a9386312585

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