From 0d1a73f4c0d35951dc42f0e35526d69c0e922afc Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 17 十月 2025 15:00:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java | 15 +++++++++++++++ 1 files changed, 15 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 6b16899..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 @@ -85,4 +85,19 @@ * @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