From 8f4db901aa772a808c243f8a4e39522f6f09d5da Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 21 八月 2025 13:10:22 +0800
Subject: [PATCH] 修改完善3

---
 src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index 0575729..d4b44ad 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -10,7 +10,9 @@
 import com.ruoyi.framework.web.domain.AjaxResult;
 
 import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
+import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
 import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
+import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
 import com.ruoyi.warehouse.pojo.Warehouse;
 import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
 import com.ruoyi.warehouse.service.WarehouseService;
@@ -32,11 +34,25 @@
     private DocumentationBorrowManagementService documentationBorrowManagementService;
     @Autowired
     private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
+    @Autowired
+    private DocumentationReturnManagementMapper documentationReturnManagementMapper;
     @GetMapping("/listPage")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
     @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
     public AjaxResult listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
         return AjaxResult.success(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
+    }
+    @GetMapping("/list")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ", businessType = BusinessType.OTHER)
+    public AjaxResult list() {
+        return AjaxResult.success(documentationBorrowManagementService.listAll());
+    }
+    @GetMapping("/listPageReturn")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+    public AjaxResult listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
+        return AjaxResult.success(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
     }
     @PostMapping("/add")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄")
@@ -47,14 +63,20 @@
     @PutMapping("/revent")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕")
     @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕", businessType = BusinessType.UPDATE)
-    public AjaxResult reventdbm(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
-        return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationBorrowManagement));
+    public AjaxResult revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+        return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
     }
     @PutMapping("/update")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-鏇存柊")
     @Log(title = "鏂囨。鍊熼槄绠＄悊-鏇存柊", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
         return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
+    }
+    @PutMapping("/reventUpdate")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊", businessType = BusinessType.UPDATE)
+    public AjaxResult reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+        return AjaxResult.success(documentationReturnManagementMapper.updateById(documentationReturnManagement));
     }
     @DeleteMapping ("/delete")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎")
@@ -79,10 +101,7 @@
     @PostMapping("/exportrevent")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭")
     @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭", businessType = BusinessType.EXPORT)
-    public void exportrevent(HttpServletResponse response,DocumentationBorrowManagement documentationBorrowManagement) {
-        documentationBorrowManagementService.exportrevent(response,documentationBorrowManagement);
-//        List<DocumentationBorrowManagement> documentationBorrowManagements = documentationBorrowManagementMapper.selectList(new LambdaQueryWrapper<DocumentationBorrowManagement>().eq(DocumentationBorrowManagement::getBorrowStatus, "褰掕繕"));
-//        ExcelUtil<DocumentationBorrowManagement> util = new ExcelUtil<>(DocumentationBorrowManagement.class);
-//        util.exportExcel(response, documentationBorrowManagements, "鏂囨。鍊熼槄-褰掕繕璁板綍");
+    public void exportrevent(HttpServletResponse response, DocumentationReturnManagement documentationReturnManagement) {
+        documentationBorrowManagementService.exportrevent(response,documentationReturnManagement);
     }
 }

--
Gitblit v1.9.3