系统合并

zhuo

2025-04-23 234b0ac195934b34c06045b2d2ef0f10e239dd8e

 cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.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;
@@ -27,7 +24,7 @@
 * 所有文件(内、外部文件)的发放与回收记录 前端控制器
 * </p>
 *
 * @author 芯导软件（江苏）有限公司
 * @author
 * @since 2024-11-13 09:11:05
 */
@Api(tags = "记录的控制")
@@ -39,13 +36,13 @@
    private ManageRecordIssueRecycleService manageRecordIssueRecycleService;

    @ApiOperation(value = "分页查询所有文件的发放与回收记录")
    @PostMapping("/pageManageRecordIssueRecycle")
    @GetMapping("/pageManageRecordIssueRecycle")
    public Result pageManageRecordIssueRecycle(Page page,ManageRecordIssueRecycle manageRecordIssueRecycle) throws Exception {
        return Result.success(manageRecordIssueRecycleService.pageManageRecordIssueRecycle(page, manageRecordIssueRecycle));
    }

    @ApiOperation(value = "删除所有文件的发放与回收记录")
    @PostMapping("/delManageRecordIssueRecycle")
    @DeleteMapping("/delManageRecordIssueRecycle")
    public Result delManageRecordIssueRecycle(Integer id){
        return Result.success(manageRecordIssueRecycleService.removeById(id));
    }
@@ -64,9 +61,8 @@
    }

    @ApiOperation(value = "导出所有文件的发放与回收记录")
    @PostMapping("/exportOutManageRecordIssueRecycle")
    public Result exportOutManageRecordIssueRecycle(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
        ManageRecordIssueRecycle manageRecordIssueRecycle = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIssueRecycle.class);
    @GetMapping("/exportOutManageRecordIssueRecycle")
    public Result exportOutManageRecordIssueRecycle(ManageRecordIssueRecycle manageRecordIssueRecycle, HttpServletResponse response) {
        return Result.success(manageRecordIssueRecycleService.exportOutManageRecordIssueRecycle(manageRecordIssueRecycle,response));
    }