From 853c8ba11072eae475273864e61733ae7294f004 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalApplicationAssetMapper.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalApplicationAssetMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalApplicationAssetMapper.java
index 56dce6a..a69ea14 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalApplicationAssetMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalApplicationAssetMapper.java
@@ -1,7 +1,16 @@
package com.ruoyi.system.mapper;
-import com.ruoyi.system.model.OaApprovalApplicationAsset;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.bo.OaApprovalApplicationAssetReturnBO;
+import com.ruoyi.system.model.OaApprovalApplicationAsset;
+import com.ruoyi.system.query.OaApprovalApplicationAssetPageQuery;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetDetailVO;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +22,10 @@
*/
public interface OaApprovalApplicationAssetMapper extends BaseMapper<OaApprovalApplicationAsset> {
+ IPage<OaApprovalApplicationAssetPageVO> getPageByType(Page<OaApprovalApplicationAssetPageVO> page,
+ @Param("query") OaApprovalApplicationAssetPageQuery query);
+
+ List<OaApprovalApplicationAssetReturnBO> selectReturnByAssetIds(@Param("assetMainIds") List<Integer> assetMainIds, @Param("applicationId") Integer applicationId);
+
+ List<OaApprovalApplicationAssetDetailVO> getBorrowDetailByApplicationCode(@Param("userId") Long userId);
}
--
Gitblit v1.7.1