From dfe379f10f5d16a3b34b33f260d3a7ca97c7fdc6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 十月 2025 14:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/AssetTypeService.java | 18 ++++++++++++++++++
1 files changed, 18 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..cfa2845 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,13 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.dto.asset.AssetTypeDTO;
import com.ruoyi.system.model.AssetType;
+import com.ruoyi.system.query.AsseIdleListQuery;
+import com.ruoyi.system.query.AssetInventoryListQuery;
+import com.ruoyi.system.query.AssetStatisticsListDetailQuery;
import com.ruoyi.system.query.AssetStatisticsListQuery;
+import com.ruoyi.system.vo.AssetIdleListVO;
+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 +64,16 @@
String getAssetCodePrefix(Integer assetTypeId);
PageInfo<AssetStatisticsVO> pageList(AssetStatisticsListQuery query);
+
+ PageInfo<AssetStatisticsDetailVO> pageListDetail(AssetStatisticsListDetailQuery query);
+
+ PageInfo<AssetInventoryVO> pageListInventory(AssetInventoryListQuery query);
+
+ PageInfo<AssetStatisticsDetailVO> pageListInventoryDetail(AssetStatisticsListDetailQuery query);
+
+ PageInfo<AssetIdleListVO> pageListIdle(AsseIdleListQuery query);
+
+ List<AssetIdleListVO> pageListIdleNoLimit(AsseIdleListQuery query);
+
+ String getAssetTypeNameById(Integer assetTypeId);
}
--
Gitblit v1.7.1