From 7c0a8a91ae6d1c684e7a358929f4bd04f3f4bfe8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 18 九月 2025 21:01:21 +0800
Subject: [PATCH] 资产管理-资产入库列表接口 资产管理-资产领用申请接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java
index 54c123d..4d1beb1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java
@@ -1,6 +1,17 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.query.AssetMainPageQuery;
+import com.ruoyi.system.service.AssetMainService;
+import com.ruoyi.system.vo.asset.AssetMainPageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -9,12 +20,23 @@
* 资产主表 前端控制器
* </p>
*
- * @author WuGuanFengYue
- * @since 2025-09-15
+ * 用于资产主数据的查询，新增：查询审批通过的资产分页列表接口
*/
+@Api(tags = {"资产-资产主数据相关接口"})
+@Validated
@RestController
@RequestMapping("/asset-main")
+@RequiredArgsConstructor
public class AssetMainController {
+ private final AssetMainService assetMainService;
+
+ @ApiOperation("获取审批通过且可用的资产分页列表（排除已领用、已处置、未归还借用）")
+ @PostMapping("/page-list")
+ public R<IPage<AssetMainPageVO>> getApprovedAssetPageList(@RequestBody AssetMainPageQuery pageQuery) {
+ IPage<AssetMainPageVO> page = assetMainService.getApprovedPageList(pageQuery);
+ return R.ok(page);
+ }
+
}
--
Gitblit v1.7.1