From 95d8e5f4348497b1eee5884086534c86b1661b4f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 十月 2025 19:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
index 2e25429..f45f5fa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
@@ -486,7 +486,15 @@
PageInfo<AssetStatisticsDetailVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<AssetStatisticsDetailVO> list = this.baseMapper.pageListInventoryDetail(query,pageInfo);
List<AssetType> assetTypes = assetTypeService.list();
+ Map<Integer, AssetType> typeMap = assetTypes.stream().collect(Collectors.toMap(AssetType::getId, e -> e));
for (AssetStatisticsDetailVO assetStatisticsDetailVO : list) {
+ AssetType child = typeMap.get(assetStatisticsDetailVO.getAssetTypeId());
+ if (child!=null){
+ AssetType parent = typeMap.get(child.getParentId());
+ if (parent!=null){
+ assetStatisticsDetailVO.setAssetTypeName(parent.getTypeName()+">"+child.getTypeName());
+ }
+ }
Integer type = assetStatisticsDetailVO.getType();
if (type==0){
String typeName = "入库";
--
Gitblit v1.7.1