From 73e27a267afa5eb2c94b3c70aa3556aaef690cea Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 19 八月 2025 09:07:07 +0800
Subject: [PATCH] 修改完善1
---
src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 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..0575729 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;
@@ -18,6 +21,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
import java.util.List;
@RestController
@@ -26,38 +30,59 @@
public class DocumentationBorrowManagementController extends BaseController {
@Autowired
private DocumentationBorrowManagementService documentationBorrowManagementService;
+ @Autowired
+ private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
@GetMapping("/listPage")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍒嗛〉鏌ヨ")
- @Log(title = "鏂囨。鍊熼槄绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+ @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
- IPage<DocumentationBorrowManagement> listPage = documentationBorrowManagementService.listPage(page, documentationBorrowManagement);
- return AjaxResult.success(listPage);
+ return AjaxResult.success(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
}
@PostMapping("/add")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-娣诲姞")
- @Log(title = "鏂囨。鍊熼槄绠＄悊-娣诲姞", businessType = BusinessType.INSERT)
+ @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")
+ @PutMapping("/revent")
+ @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕", businessType = BusinessType.UPDATE)
+ public AjaxResult reventdbm(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
+ return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationBorrowManagement));
+ }
+ @PutMapping("/update")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- documentationBorrowManagementService.updateById(documentationBorrowManagement);
- return AjaxResult.success();
+ return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
}
- @PostMapping("/delete")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍒犻櫎")
- @Log(title = "鏂囨。鍊熼槄绠＄悊-鍒犻櫎", businessType = BusinessType.DELETE)
+ @DeleteMapping ("/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));
+ }
+ @DeleteMapping ("/reventDelete")
+ @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult reventdelete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(documentationBorrowManagementService.reventDeleteByIds(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) {
+ documentationBorrowManagementService.export(response,documentationBorrowManagement);
+ }
+ @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, "鏂囨。鍊熼槄-褰掕繕璁板綍");
}
}
--
Gitblit v1.9.3