From 0d82e9bb89c8569847537f1ce8b9d994bbc4099b Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 29 九月 2025 19:57:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/AssetTypeService.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 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 a37323f..80d3960 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 @@ -1,8 +1,17 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; +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; import java.util.List; @@ -47,4 +56,23 @@ */ void batchDeleteAssetType(List<Integer> ids); + /** + * 根据资产类型ID获取资产编码前缀 + * @param assetTypeId 资产类型ID + * @return 资产编码前缀(一级分类简写+二级分类简写) + */ + 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); + } -- Gitblit v1.7.1