From 60afc1c228318d136a273cd0b389217f87583277 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 十月 2025 11:29:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java
index eca0dea..681a043 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java
@@ -1,16 +1,33 @@
package com.ruoyi.system.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.system.model.AssetMain;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.query.AssetMainPageQuery;
+import com.ruoyi.system.vo.asset.AssetMainPageVO;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
* 资产主表 Mapper 接口
* </p>
- *
- * @author WuGuanFengYue
- * @since 2025-09-15
*/
public interface AssetMainMapper extends BaseMapper<AssetMain> {
+ /**
+ * 分页查询审批通过的资产
+ * @param page 分页参数
+ * @param query 查询条件
+ * @return 分页数据
+ */
+ IPage<AssetMainPageVO> selectApprovedAssetPage(Page<?> page, @Param("query") AssetMainPageQuery query);
+
+ /**
+ * 获取已入库的资产列表
+ * @param page
+ * @param pageQuery
+ * @return
+ */
+ IPage<AssetMainPageVO> getAssetPageList(Page<AssetMainPageVO> page, @Param("query") AssetMainPageQuery pageQuery);
}
--
Gitblit v1.7.1