From f0c137e99ade8b7dc3234944f2ff5f467d60483e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 十月 2025 11:56:40 +0800
Subject: [PATCH] 资产汇总 出入库记录 闲置房产
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 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 20e3869..4e0f965 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
@@ -14,12 +14,14 @@
import com.ruoyi.system.model.AssetInventoryRecord;
import com.ruoyi.system.model.AssetMain;
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.service.AssetInventoryRecordService;
import com.ruoyi.system.service.AssetMainService;
import com.ruoyi.system.service.AssetTypeService;
+import com.ruoyi.system.vo.AssetIdleListVO;
import com.ruoyi.system.vo.AssetInventoryVO;
import com.ruoyi.system.vo.AssetStatisticsDetailVO;
import com.ruoyi.system.vo.AssetStatisticsVO;
@@ -337,7 +339,7 @@
Integer otherCount= 0;
BigDecimal totalValue = new BigDecimal("0");
List<AssetMain> assetMains = assetMainMap.get(asset.getAssetTypeIdSecond());
- if (!assetMains.isEmpty()){
+ if (assetMains!=null&& !assetMains.isEmpty()){
for (AssetMain assetMain : assetMains) {
if (assetMain.getAssetStatus().contains("闲置")){
idleCount += assetMain.getQuantity();
@@ -491,4 +493,29 @@
return pageInfo;
}
+ @Override
+ public PageInfo<AssetIdleListVO> pageListIdle(AsseIdleListQuery query) {
+ Map<Integer, AssetType> assetTypeMap = assetTypeService.list().stream().collect(
+ Collectors.toMap(AssetType::getId, e -> e)
+ );
+ PageInfo<AssetIdleListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<AssetIdleListVO> list = this.baseMapper.pageListIdle(query,pageInfo);
+ for (AssetIdleListVO assetIdleListVO : list) {
+ AssetType assetType = assetTypeMap.get(assetIdleListVO.getAssetTypeId());
+ if (assetType!=null){
+ AssetType parent = assetTypeMap.get(assetType.getParentId());
+ assetIdleListVO.setAssetTypeName(parent.getTypeName()+">"+assetType.getTypeName());
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public List<AssetIdleListVO> pageListIdleNoLimit(AsseIdleListQuery query) {
+ List<AssetIdleListVO> list = this.baseMapper.pageListIdleNoLimit(query);
+
+ return list;
+ }
+
}
--
Gitblit v1.7.1