From 8537a164dbd4c8696c3269141a8f18922d4ed15f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 十月 2025 09:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java | 74 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 4 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 e1b747b..242d43c 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
@@ -2,11 +2,15 @@
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.dto.asset.OaApprovalApplicationAssetReturnDTO;
+import com.ruoyi.system.model.OaApprovalApplicationAsset;
import com.ruoyi.system.query.OaApprovalApplicationAssetPageQuery;
-import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO;
+import com.ruoyi.system.vo.asset.AssetMainVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetDetailVO;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO;
+
+import java.util.List;
/**
* <p>
@@ -19,10 +23,10 @@
public interface OaApprovalApplicationAssetService extends IService<OaApprovalApplicationAsset> {
/**
- * 提交资产领用申请
+ * 提交资产领用/归还申请
* @param dto 领用申请DTO
*/
- void submitReceive(OaApprovalApplicationAssetReceiveDTO dto);
+ void submitReceiveBorrow(OaApprovalApplicationAssetReceiveDTO dto);
/**
* 获取资产领用申请分页列表
@@ -34,4 +38,66 @@
* @param id 领用/借用/归还明细表ID（oa_approval_application_asset.id）
*/
OaApprovalApplicationAssetDetailVO getDetail(Integer id);
+
+ /**
+ * 获取借用资产申请列表
+ * @param pageQuery
+ * @return
+ */
+ IPage<OaApprovalApplicationAssetPageVO> getBorrowPageList(OaApprovalApplicationAssetPageQuery pageQuery);
+
+ /**
+ * 获取借用单详情
+ * @param id
+ * @return
+ */
+ OaApprovalApplicationAssetDetailVO getBorrowDetail(Integer id);
+
+ /**
+ * 查询当前登录人未归还的借用单列表
+ * @return
+ */
+ List<OaApprovalApplicationAssetDetailVO> getBorrowDetailByApplicationCode();
+
+ /**
+ * 根据审批单ID获取借用单详情列表
+ * @param id
+ * @return
+ */
+ List<AssetMainVO> getBorrowDetailList(Integer applicationId);
+
+ /**
+ * 归还申请
+ * @param dto
+ */
+ void submitReturn(OaApprovalApplicationAssetReturnDTO dto);
+
+ /**
+ * 归还列表
+ * @param pageQuery
+ * @return
+ */
+ IPage<OaApprovalApplicationAssetPageVO> getReturnPageList(OaApprovalApplicationAssetPageQuery pageQuery);
+
+ /**
+ * 获取归还提醒列表
+ * @param pageQuery
+ * @return
+ */
+ IPage<OaApprovalApplicationAssetPageVO> getReturnNotifyPageList(OaApprovalApplicationAssetPageQuery pageQuery);
+
+ /**
+ * 获取归还单详情
+ * @param id
+ * @return
+ */
+ OaApprovalApplicationAssetDetailVO getReturnDetail(Integer id);
+
+ /**
+ * 删除审批单相关的资产领用/借用/归还记录
+ * @param applicationId
+ */
+ void deleteByApplicationId(Integer applicationId);
+
+ OaApprovalApplicationAsset getOaApprovalApplicationAssetByApplicationId(Integer applicationId);
}
--
Gitblit v1.7.1