From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index 48c96a6..f02118a 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -1,41 +1,32 @@
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.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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDateTime;
import java.util.List;
@RestController
@Api(tags = "鏂囨。鍊熼槄绠＄悊")
@RequestMapping("/documentationBorrowManagement")
+@AllArgsConstructor
public class DocumentationBorrowManagementController extends BaseController {
- @Autowired
+
private DocumentationBorrowManagementService documentationBorrowManagementService;
- @Autowired
- private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
- @Autowired
private DocumentationReturnManagementMapper documentationReturnManagementMapper;
+
@GetMapping("/listPage")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@@ -57,7 +48,7 @@
@GetMapping("/getByDocumentationId/{id}")
@ApiOperation("鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍")
@Log(title = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍", businessType = BusinessType.OTHER)
- public AjaxResult getByDocumentationId(@PathVariable("id") Long id) {
+ public AjaxResult getByDocumentationId(@PathVariable Long id) {
return AjaxResult.success(documentationBorrowManagementService.selectByDocumentationId(id));
}
@PostMapping("/add")
--
Gitblit v1.9.3