From 9d5128803ebebb5788f13924a5775ac16494dfef Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 18 八月 2025 10:05:05 +0800
Subject: [PATCH] 仓库，树，文档，借出修改
---
src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index e70cce9..f86b15e 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -8,6 +8,7 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.DocumentationService;
@@ -29,43 +30,38 @@
@ApiOperation("鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, Documentation documentation) {
- IPage<Documentation> listPage = documentationService.listPage(page, documentation);
- return AjaxResult.success(listPage);
- }
- @GetMapping("/list")
- @ApiOperation("鏂囨。淇℃伅琛�")
- @Log(title = "鏂囨。淇℃伅琛�", businessType = BusinessType.OTHER)
- public AjaxResult list() {
- List<Documentation> list = documentationService.list();
+ List<DocumentationDto> list = documentationService.listPage(page, documentation);
return AjaxResult.success(list);
}
@PostMapping("/add")
@ApiOperation("鏂囨。淇℃伅琛�-娣诲姞")
@Log(title = "鏂囨。淇℃伅琛�-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Documentation documentation) {
- boolean save = documentationService.save(documentation);
- return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+ return AjaxResult.success(documentationService.save(documentation));
}
- @PostMapping("/update")
+ @PutMapping("/update")
@ApiOperation("鏂囨。淇℃伅琛�-鏇存柊")
@Log(title = "鏂囨。淇℃伅琛�-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody Documentation documentation) {
return AjaxResult.success(documentationService.updateById(documentation));
}
- @PostMapping("/delete")
+ @DeleteMapping("/delete")
@ApiOperation("鏂囨。淇℃伅琛�-鍒犻櫎")
@Log(title = "鏂囨。淇℃伅琛�-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- boolean remove = documentationService.removeBatchByIds(ids);
-// boolean remove = documentationService.deleteByIds(ids);
- return remove ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ return AjaxResult.success(documentationService.deleteByIds(ids));
}
@PostMapping("/export")
@ApiOperation("鏂囨。淇℃伅琛�-瀵煎嚭")
@Log(title = "鏂囨。淇℃伅琛�-瀵煎嚭", businessType = BusinessType.EXPORT)
- public void export(HttpServletResponse response) {
- documentationService.export(response);
+ public void export(HttpServletResponse response,Documentation documentation ) {
+ documentationService.export(response,documentation);
}
+ //闄勪欢璇︽儏
+// @GetMapping("/getDocumentation")
+// public Documentation getDocumentation(Documentation documentation) {
+// return documentationService.getById(id);
+// }
}
--
Gitblit v1.9.3