From 853c8ba11072eae475273864e61733ae7294f004 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 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 055b0e6..db13495 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
@@ -1,11 +1,12 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import org.springframework.util.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -15,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;
@@ -24,19 +28,28 @@
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;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* 资产主表 服务实现类
@@ -46,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;
@@ -57,6 +71,8 @@
private final OaApprovalApplicationStorageAssetVehicleExtMapper oaApprovalApplicationStorageAssetVehicleExtMapper;
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());
@@ -92,8 +108,8 @@
public void saveAssetByApprovalApplicationId(Integer approvalApplicationId) {
// 1. 根据approvalApplicationId查询审批通过的资产列表
List<OaApprovalApplicationStorageAsset> storageAssets = oaApprovalApplicationStorageAssetMapper
- .selectList(new QueryWrapper<OaApprovalApplicationStorageAsset>()
- .eq("approval_application_id", approvalApplicationId));
+ .selectList(new LambdaQueryWrapper<OaApprovalApplicationStorageAsset>()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, approvalApplicationId));
if (CollectionUtils.isEmpty(storageAssets)) {
return;
@@ -116,7 +132,7 @@
assetMain.setAssetCode(assetCode);
// 单个资产的数量设为1
- assetMain.setQuantity(BigDecimal.ONE);
+ assetMain.setQuantity(1);
// 单个资产的总价值等于单价
assetMain.setTotalValue(storageAsset.getUnitPrice());
@@ -149,8 +165,8 @@
private void savePropertyExtension(Integer storageAssetId, Integer assetMainId) {
// 查询房产扩展信息
OaApprovalApplicationStorageAssetPropertyExt propertyExt = oaApprovalApplicationStorageAssetPropertyExtMapper
- .selectOne(new QueryWrapper<OaApprovalApplicationStorageAssetPropertyExt>()
- .eq("storage_asset_id", storageAssetId));
+ .selectOne(new LambdaQueryWrapper<OaApprovalApplicationStorageAssetPropertyExt>()
+ .eq(OaApprovalApplicationStorageAssetPropertyExt::getStorageAssetId, storageAssetId));
if (propertyExt != null) {
AssetPropertyExt assetPropertyExt = new AssetPropertyExt();
@@ -184,4 +200,54 @@
assetVehicleExtMapper.insert(assetVehicleExt);
}
}
+
+ @Override
+ public List<AssetMainVO> getListByIds(List<Integer> assetMainIds) {
+ if (!CollectionUtils.isEmpty(assetMainIds)) {
+ List<AssetMain> assetMains = this.lambdaQuery()
+ .in(AssetMain::getId, assetMainIds)
+ .list();
+ //查询资产类型名称
+ 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));
+ //查询批量查询部门名称
+ //使用部门
+ 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;
+ }
+ return Collections.emptyList();
+ }
}
--
Gitblit v1.7.1