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/service/AssetTypeService.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/AssetTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/AssetTypeService.java index 7a73cd7..2401d9e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/AssetTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/AssetTypeService.java @@ -4,7 +4,11 @@ import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.dto.asset.AssetTypeDTO; import com.ruoyi.system.model.AssetType; +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 com.ruoyi.system.vo.asset.AssetTypeTreeVO; @@ -58,4 +62,11 @@ String getAssetCodePrefix(Integer assetTypeId); PageInfo<AssetStatisticsVO> pageList(AssetStatisticsListQuery query); + + PageInfo<AssetStatisticsDetailVO> pageListDetail(AssetStatisticsListDetailQuery query); + + PageInfo<AssetInventoryVO> pageListInventory(AssetInventoryListQuery query); + + PageInfo<AssetStatisticsDetailVO> pageListInventoryDetail(AssetStatisticsListDetailQuery query); + } -- Gitblit v1.7.1