From fda182841a8258e355365c8ff16f28672b8523e6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:55:34 +0800
Subject: [PATCH] 联调问题修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java
index 3840bd6..ee541e3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java
@@ -2,15 +2,11 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.common.core.domain.entity.TDept;
-import com.ruoyi.system.model.AssetType;
-import com.ruoyi.system.service.TDeptService;
-import com.ruoyi.system.vo.asset.AssetMainVO;
-import org.springframework.util.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.mapper.AssetMainMapper;
import com.ruoyi.system.mapper.AssetPropertyExtMapper;
@@ -20,7 +16,10 @@
import com.ruoyi.system.mapper.OaApprovalApplicationStorageAssetVehicleExtMapper;
import com.ruoyi.system.model.AssetMain;
import com.ruoyi.system.model.AssetPropertyExt;
+import com.ruoyi.system.model.AssetType;
import com.ruoyi.system.model.AssetVehicleExt;
+import com.ruoyi.system.model.AssetWarehouse;
+import com.ruoyi.system.model.OaApprovalApplicationStorage;
import com.ruoyi.system.model.OaApprovalApplicationStorageAsset;
import com.ruoyi.system.model.OaApprovalApplicationStorageAssetPropertyExt;
import com.ruoyi.system.model.OaApprovalApplicationStorageAssetVehicleExt;
@@ -29,13 +28,18 @@
import com.ruoyi.system.service.AssetPropertyExtService;
import com.ruoyi.system.service.AssetTypeService;
import com.ruoyi.system.service.AssetVehicleExtService;
+import com.ruoyi.system.service.AssetWarehouseService;
import com.ruoyi.system.service.OaApprovalApplicationStorageAssetPropertyExtService;
import com.ruoyi.system.service.OaApprovalApplicationStorageAssetService;
import com.ruoyi.system.service.OaApprovalApplicationStorageAssetVehicleExtService;
+import com.ruoyi.system.service.OaApprovalApplicationStorageService;
+import com.ruoyi.system.service.TDeptService;
import com.ruoyi.system.vo.asset.AssetMainPageVO;
+import com.ruoyi.system.vo.asset.AssetMainVO;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -44,6 +48,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -54,6 +59,7 @@
public class AssetMainServiceImpl extends ServiceImpl<AssetMainMapper, AssetMain> implements AssetMainService {
private final AssetTypeService assetTypeService;
private final OaApprovalApplicationStorageAssetService oaApprovalApplicationStorageAssetService;
+ private final OaApprovalApplicationStorageService oaApprovalApplicationStorageService;
private final OaApprovalApplicationStorageAssetPropertyExtService oaApprovalApplicationStorageAssetPropertyExtService;
private final OaApprovalApplicationStorageAssetVehicleExtService oaApprovalApplicationStorageAssetVehicleExtService;
private final AssetVehicleExtService assetVehicleExtService;
@@ -66,6 +72,7 @@
private final AssetPropertyExtMapper assetPropertyExtMapper;
private final AssetVehicleExtMapper assetVehicleExtMapper;
private final TDeptService tDeptService;
+ private final AssetWarehouseService assetWarehouseService;
@Override
public IPage<AssetMainPageVO> getApprovedPageList(AssetMainPageQuery pageQuery) {
Page<AssetMainPageVO> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
@@ -204,14 +211,40 @@
List<Integer> assetTypeIds = assetMains.stream().map(AssetMain::getAssetTypeId).distinct().collect(Collectors.toList());
Map<Integer, String> typeNameMap = assetTypeIds.isEmpty() ? Collections.emptyMap() : assetTypeService.listByIds(assetTypeIds).stream()
.collect(Collectors.toMap(AssetType::getId, AssetType::getTypeName));
- //查询归属部门名称
- List<Integer> deptIds = assetMains.stream().map(AssetMain::getOwnershipDeptId).distinct().collect(Collectors.toList());
+ //查询批量查询部门名称
+ //使用部门
+ Set<Integer> useDeptIds = assetMains.stream().filter(item -> item.getAddressType().equals(0))
+ .map(AssetMain::getUseDeptId).collect(Collectors.toSet());
+ //归属部门
+ Set<Integer> deptIds = assetMains.stream().map(AssetMain::getOwnershipDeptId).collect(Collectors.toSet());
+ deptIds.addAll(useDeptIds);
Map<Integer, String> deptNameMap = deptIds.isEmpty() ? Collections.emptyMap() : tDeptService.listByIds(deptIds).stream()
.collect(Collectors.toMap(TDept::getId, TDept::getDeptName));
+ //查询资产入库时间
+ List<Integer> applicationIds = assetMains.stream().map(AssetMain::getApprovalApplicationId).distinct().collect(Collectors.toList());
+ Map<Integer, LocalDate> storageTimeMap = oaApprovalApplicationStorageService.lambdaQuery().in(OaApprovalApplicationStorage::getApprovalApplicationId, applicationIds).list().stream().collect(Collectors.toMap(OaApprovalApplicationStorage::getApprovalApplicationId, OaApprovalApplicationStorage::getStorageTime));
+ //查询使用仓库
+ Set<Integer> warehouseIds = assetMains.stream().filter(item -> item.getAddressType().equals(1)).map(AssetMain::getWarehouseId).collect(Collectors.toSet());
+ Map<Integer, String> warehouseNameMap = warehouseIds.isEmpty() ? Collections.emptyMap() : assetWarehouseService.listByIds(warehouseIds).stream()
+ .collect(Collectors.toMap(AssetWarehouse::getId, AssetWarehouse::getWarehouseName));
+ for (AssetMain assetMain : assetMains) {
+ switch (assetMain.getAddressType()) {
+ case 0:
+ assetMain.setUseDeptOrLocation(deptNameMap.get(assetMain.getUseDeptId()));
+ break;
+ case 1:
+ assetMain.setUseDeptOrLocation(warehouseNameMap.get(assetMain.getWarehouseId()));
+ break;
+ case 2:
+ assetMain.setUseDeptOrLocation(assetMain.getAddress());
+ break;
+ }
+ }
List<AssetMainVO> voList = BeanUtil.copyToList(assetMains, AssetMainVO.class);
for (AssetMainVO assetMainVO : voList) {
assetMainVO.setAssetTypeName(typeNameMap.get(assetMainVO.getAssetTypeId()));
assetMainVO.setOwnershipDeptName(deptNameMap.get(assetMainVO.getOwnershipDeptId()));
+ assetMainVO.setStorageTime(storageTimeMap.get(assetMainVO.getApprovalApplicationId()));
}
return voList;
}
--
Gitblit v1.7.1