From b0c345d2a74f47e5c34617051bcd61becde11b96 Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期五, 15 八月 2025 14:09:59 +0800 Subject: [PATCH] 业务流程修改 --- src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java index 652794f..24d20dd 100644 --- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java +++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java @@ -1,12 +1,15 @@ package com.ruoyi.warehouse.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.domain.AjaxResult; +import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper; import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement; import com.ruoyi.warehouse.pojo.Warehouse; import com.ruoyi.warehouse.service.DocumentationBorrowManagementService; @@ -26,6 +29,8 @@ public class DocumentationBorrowManagementController extends BaseController { @Autowired private DocumentationBorrowManagementService documentationBorrowManagementService; + @Autowired + private DocumentationBorrowManagementMapper documentationBorrowManagementMapper; @GetMapping("/listPage") @ApiOperation("鏂囨。鍊熼槄绠$悊-鍒嗛〉鏌ヨ") @Log(title = "鏂囨。鍊熼槄绠$悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER) @@ -37,27 +42,29 @@ @ApiOperation("鏂囨。鍊熼槄绠$悊-娣诲姞") @Log(title = "鏂囨。鍊熼槄绠$悊-娣诲姞", businessType = BusinessType.INSERT) public AjaxResult add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) { - documentationBorrowManagementService.save(documentationBorrowManagement); - return AjaxResult.success(); + return AjaxResult.success(documentationBorrowManagementService.add(documentationBorrowManagement)); } @PostMapping("/update") @ApiOperation("鏂囨。鍊熼槄绠$悊-鏇存柊") @Log(title = "鏂囨。鍊熼槄绠$悊-鏇存柊", businessType = BusinessType.UPDATE) public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) { - documentationBorrowManagementService.updateById(documentationBorrowManagement); - return AjaxResult.success(); +// documentationBorrowManagementService.updateById(documentationBorrowManagement); + return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement)); } @PostMapping("/delete") @ApiOperation("鏂囨。鍊熼槄绠$悊-鍒犻櫎") @Log(title = "鏂囨。鍊熼槄绠$悊-鍒犻櫎", businessType = BusinessType.DELETE) public AjaxResult delete(@RequestBody List<Long> ids) { - documentationBorrowManagementService.removeByIds(ids); - return AjaxResult.success(); + if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D"); + return AjaxResult.success(documentationBorrowManagementService.deleteByIds(ids)); } @PostMapping("/export") - @ApiOperation("鏂囨。淇℃伅琛�-瀵煎嚭") - @Log(title = "鏂囨。淇℃伅琛�-瀵煎嚭", businessType = BusinessType.EXPORT) - public void export(HttpServletResponse response) { - documentationBorrowManagementService.export(response); + @ApiOperation("鏂囨。鍊熼槄绠$悊-瀵煎嚭") + @Log(title = "鏂囨。鍊熼槄绠$悊-瀵煎嚭", businessType = BusinessType.EXPORT) + public void export(HttpServletResponse response,DocumentationBorrowManagement documentationBorrowManagement) { + String borrowStatus = documentationBorrowManagement.getBorrowStatus(); + List<DocumentationBorrowManagement> documentationBorrowManagements = documentationBorrowManagementMapper.selectList(new LambdaQueryWrapper<DocumentationBorrowManagement>().eq(DocumentationBorrowManagement::getBorrowStatus, borrowStatus)); + ExcelUtil<DocumentationBorrowManagement> util = new ExcelUtil<>(DocumentationBorrowManagement.class); + util.exportExcel(response, documentationBorrowManagements, "鏂囨。鍊熼槄-褰掕繕璁板綍"); } } -- Gitblit v1.9.3