From 291a72bf35e2d39b816abc0ebf085cfa9da3ee06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 14:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java
index 4c4251e..840988e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java
@@ -1,7 +1,12 @@
 package com.ruoyi.system.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.model.OaApprovalApplicationAsset;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationAssetReceiveDTO;
+import com.ruoyi.system.query.OaApprovalApplicationAssetPageQuery;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetDetailVO;
 
 /**
  * <p>
@@ -13,4 +18,27 @@
  */
 public interface OaApprovalApplicationAssetService extends IService<OaApprovalApplicationAsset> {
 
+    /**
+     * 提交资产领用/归还申请
+     * @param dto 领用申请DTO
+     */
+    void submitReceiveBorrow(OaApprovalApplicationAssetReceiveDTO dto);
+
+    /**
+     * 获取资产领用申请分页列表
+     */
+    IPage<OaApprovalApplicationAssetPageVO> getReceivePageList(OaApprovalApplicationAssetPageQuery pageQuery);
+
+    /**
+     * 获取资产领用/借用/归还详情
+     * @param id 领用/借用/归还明细表ID(oa_approval_application_asset.id)
+     */
+    OaApprovalApplicationAssetDetailVO getDetail(Integer id);
+
+    /**
+     * 获取借用资产申请列表
+     * @param pageQuery
+     * @return
+     */
+    IPage<OaApprovalApplicationAssetPageVO> getBorrowPageList(OaApprovalApplicationAssetPageQuery pageQuery);
 }

--
Gitblit v1.7.1