From 78b6c7de4a1e710b4b20c96f1caf44f5624d37de Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 24 十月 2025 18:13:54 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 0df58f2..2e25429 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
@@ -348,7 +348,7 @@
idleCount += assetMain.getQuantity();
}else if (assetMain.getAssetStatus().contains("使用中")){
useCount += assetMain.getQuantity();
- }else if (assetMain.getAssetStatus().contains("损坏") || assetMain.getAssetStatus().contains("报废")){
+ }else if (assetMain.getAssetStatus().contains("损") || assetMain.getAssetStatus().contains("废")){
disposeCount += assetMain.getQuantity();
}else{
otherCount += assetMain.getQuantity();
@@ -536,4 +536,14 @@
return list;
}
+ @Override
+ public String getAssetTypeNameById(Integer assetTypeId) {
+ if (assetTypeId != null) {
+ AssetType assetType = this.getById(assetTypeId);
+ if (assetType != null) {
+ return assetType.getTypeName();
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.7.1