From c758c4e55d74a34902dac5752ff4f160118b19bc Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 14:09:36 +0800
Subject: [PATCH] 资产借用接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationAssetController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationAssetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationAssetController.java
index 7540da5..c83e622 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationAssetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationAssetController.java
@@ -13,6 +13,7 @@
import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetDetailVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -42,7 +43,7 @@
@PostMapping("/submit-receive")
@Log(title = "资产领用申请-提交", businessType = BusinessType.INSERT)
public R<Void> submitReceive(@Valid @RequestBody OaApprovalApplicationAssetReceiveDTO dto) {
- oaApprovalApplicationAssetService.submitReceive(dto);
+ oaApprovalApplicationAssetService.submitReceiveBorrow(dto);
return R.ok();
}
@@ -65,9 +66,34 @@
@ApiOperation("获取资产领用详情")
@GetMapping("/detail/receive/{id}")
- public R<OaApprovalApplicationAssetDetailVO> getReceiveDetail(@PathVariable Integer id) {
+ public R<OaApprovalApplicationAssetDetailVO> getReceiveDetail(@ApiParam(name = "id", value = "审批单ID", required = true) @PathVariable Integer id) {
OaApprovalApplicationAssetDetailVO detail = oaApprovalApplicationAssetService.getDetail(id);
return R.ok(detail);
}
+ @ApiOperation("提交资产借用申请")
+ @PostMapping("/submit-borrow")
+ @Log(title = "资产借用申请-提交", businessType = BusinessType.INSERT)
+ public R<Void> submitBorrow(@Valid @RequestBody OaApprovalApplicationAssetReceiveDTO dto) {
+ oaApprovalApplicationAssetService.submitReceiveBorrow(dto);
+ return R.ok();
+ }
+
+ @ApiOperation("获取资产借用申请分页列表")
+ @PostMapping("/page-borrow-list")
+ public R<IPage<OaApprovalApplicationAssetPageVO>> getBorrowPageList(@RequestBody OaApprovalApplicationAssetPageQuery pageQuery) {
+ // 数据权限：非管理员仅能查看本部门
+ Long userId = SecurityUtils.getUserId();
+ boolean isAdmin = SecurityUtils.isAdmin(userId);
+ if (!isAdmin) {
+ try {
+ pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getDeptId()));
+ } catch (Exception e) {
+ // ignore parse, leave null if cannot parse
+ }
+ }
+ IPage<OaApprovalApplicationAssetPageVO> page = oaApprovalApplicationAssetService.getBorrowPageList(pageQuery);
+ return R.ok(page);
+ }
+
}
--
Gitblit v1.7.1