From 325c6107782d4a2284bb24be688e7a87462dc202 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期日, 28 九月 2025 14:48:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetTypeMapper.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetTypeMapper.java
index e3a5359..a655310 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetTypeMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetTypeMapper.java
@@ -3,7 +3,11 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.AssetType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.query.AssetInventoryListQuery;
+import com.ruoyi.system.query.AssetStatisticsListDetailQuery;
import com.ruoyi.system.query.AssetStatisticsListQuery;
+import com.ruoyi.system.vo.AssetInventoryVO;
+import com.ruoyi.system.vo.AssetStatisticsDetailVO;
import com.ruoyi.system.vo.AssetStatisticsVO;
import org.apache.ibatis.annotations.Param;
@@ -22,4 +26,13 @@
List<AssetStatisticsVO> pageList(@Param("query")AssetStatisticsListQuery query, @Param("pageInfo")PageInfo<AssetStatisticsVO> pageInfo);
List<AssetStatisticsVO> pageListNoLimit(@Param("query")AssetStatisticsListQuery query);
+
+ List<AssetStatisticsDetailVO> pageListDetail(@Param("query")AssetStatisticsListDetailQuery query, @Param("pageInfo")PageInfo<AssetStatisticsDetailVO> pageInfo);
+
+ List<AssetInventoryVO> pageListInventory(@Param("query")AssetInventoryListQuery query,@Param("pageInfo") PageInfo<AssetInventoryVO> pageInfo);
+
+ List<AssetStatisticsDetailVO> pageListInventoryDetail(@Param("query")AssetStatisticsListDetailQuery query,@Param("pageInfo") PageInfo<AssetStatisticsDetailVO> pageInfo);
+
+
+
}
--
Gitblit v1.7.1