From 10f6e465c9753ff99099a22aabe72ede4e25eab7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 13:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java | 388 +++++++++++++++++++-----------------------------------
1 files changed, 139 insertions(+), 249 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java
index d875739..5c9f687 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,30 +14,24 @@
import com.ruoyi.system.emums.ApprovalTypeEnum;
import com.ruoyi.system.emums.AssetTypeEnum;
import com.ruoyi.system.mapper.OaApprovalApplicationStorageMapper;
-import com.ruoyi.system.model.AssetGeneralExt;
-import com.ruoyi.system.model.AssetMain;
-import com.ruoyi.system.model.AssetPropertyExt;
-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;
import com.ruoyi.system.model.OaApprovalApplications;
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.query.ApprovalDetailQuery;
import com.ruoyi.system.query.OaApprovalApplicationStoragePageQuery;
-import com.ruoyi.system.service.AssetGeneralExtService;
-import com.ruoyi.system.service.AssetMainService;
-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.ISysDeptService;
-import com.ruoyi.system.service.ISysUserService;
+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.OaApprovalApplicationsService;
import com.ruoyi.system.service.OaApprovalFlowNodeService;
import com.ruoyi.system.service.OaApprovalTodoService;
import com.ruoyi.system.service.TDeptService;
-import com.ruoyi.system.vo.PurchaseListVO;
import com.ruoyi.system.vo.StorageListVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageGeneralDetailVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO;
@@ -47,12 +42,13 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -68,15 +64,11 @@
public class OaApprovalApplicationStorageServiceImpl extends ServiceImpl<OaApprovalApplicationStorageMapper, OaApprovalApplicationStorage> implements OaApprovalApplicationStorageService {
private final OaApprovalApplicationsService oaApprovalApplicationsService;
- private final AssetMainService assetMainService;
- private final AssetGeneralExtService assetGeneralExtService;
- private final AssetPropertyExtService assetPropertyExtService;
- private final AssetVehicleExtService assetVehicleExtService;
- private final AssetTypeService assetTypeService;
+ private final OaApprovalApplicationStorageAssetService oaApprovalApplicationStorageAssetService;
+ private final OaApprovalApplicationStorageAssetPropertyExtService oaApprovalApplicationStorageAssetPropertyExtService;
+ private final OaApprovalApplicationStorageAssetVehicleExtService oaApprovalApplicationStorageAssetVehicleExtService;
private final OaApprovalFlowNodeService oaApprovalFlowNodeService;
private final OaApprovalTodoService oaApprovalTodoService;
- private final ISysUserService sysUserService;
- private final ISysDeptService sysDeptService;
private final TDeptService tDeptService;
private final AssetWarehouseService assetWarehouseService;
@@ -150,104 +142,78 @@
* 保存通用资产数据
*/
private void saveGeneralAssets(List<OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageGeneralDTO baseDto) {
- List<AssetMain> allAssetMains = new ArrayList<>();
+ List<OaApprovalApplicationStorageAsset> storageAssets = new ArrayList<>();
for (OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item : assetItems) {
// 根据数量创建对应数量的资产记录
- int quantity = item.getQuantity().intValue();
- for (int i = 0; i < quantity; i++) {
- AssetMain assetMain = buildAssetMain(item, applicationId, assetTypeId, storageDate, baseDto);
- assetMain.setAssetMainType(AssetTypeEnum.GENERAL.getCode());
- assetMain.setQuantity(BigDecimal.ONE); // 每个资产记录数量为1
- assetMain.setTotalValue(item.getUnitPrice()); // 总价值等于单价
- allAssetMains.add(assetMain);
- }
+ OaApprovalApplicationStorageAsset assetMain = buildAssetMain(item, applicationId, assetTypeId, storageDate, baseDto);
+ assetMain.setAssetMainType(AssetTypeEnum.GENERAL.getCode());
+ storageAssets.add(assetMain);
}
-
// 批量保存资产主表数据
- assetMainService.saveBatch(allAssetMains);
+ oaApprovalApplicationStorageAssetService.saveBatch(storageAssets);
}
/**
* 保存房产资产数据
*/
private void savePropertyAssets(List<OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStoragePropertyDTO baseDto) {
- List<AssetMain> allAssetMains = new ArrayList<>();
- List<AssetPropertyExt> allPropertyExts = new ArrayList<>();
+ List<OaApprovalApplicationStorageAsset> allAssetMains = new ArrayList<>();
+ List<OaApprovalApplicationStorageAssetPropertyExt> allPropertyExts = new ArrayList<>();
for (OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item : assetItems) {
- // 根据数量创建对应数量的资产记录
- int quantity = item.getQuantity().intValue();
- for (int i = 0; i < quantity; i++) {
- AssetMain assetMain = buildAssetMainFromProperty(item, applicationId, assetTypeId, storageDate, baseDto);
- assetMain.setAssetMainType(AssetTypeEnum.HOUSE.getCode());
- assetMain.setQuantity(BigDecimal.ONE); // 每个资产记录数量为1
- assetMain.setTotalValue(item.getUnitPrice()); // 总价值等于单价
- allAssetMains.add(assetMain);
- }
+ OaApprovalApplicationStorageAsset assetMain = buildAssetMainFromProperty(item, applicationId, assetTypeId, storageDate, baseDto);
+ assetMain.setAssetMainType(AssetTypeEnum.HOUSE.getCode());
+ allAssetMains.add(assetMain);
}
// 批量保存资产主表数据
- assetMainService.saveBatch(allAssetMains);
+ oaApprovalApplicationStorageAssetService.saveBatch(allAssetMains);
// 为每个资产主表记录创建对应的扩展信息
- int assetMainIndex = 0;
- for (OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item : assetItems) {
- int quantity = item.getQuantity().intValue();
- for (int i = 0; i < quantity; i++) {
- AssetPropertyExt propertyExt = buildAssetPropertyExt(item, allAssetMains.get(assetMainIndex).getId());
+ for (OaApprovalApplicationStorageAsset allAssetMain : allAssetMains) {
+ for (OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item : assetItems) {
+ OaApprovalApplicationStorageAssetPropertyExt propertyExt = buildAssetPropertyExt(item, allAssetMain.getId());
allPropertyExts.add(propertyExt);
- assetMainIndex++;
}
}
-
- assetPropertyExtService.saveBatch(allPropertyExts);
+ oaApprovalApplicationStorageAssetPropertyExtService.saveBatch(allPropertyExts);
}
/**
* 保存车辆资产数据
*/
private void saveVehicleAssets(List<OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageVehicleDTO baseDto) {
- List<AssetMain> allAssetMains = new ArrayList<>();
- List<AssetVehicleExt> allVehicleExts = new ArrayList<>();
-
+ List<OaApprovalApplicationStorageAsset> allAssetMains = new ArrayList<>();
+ List<OaApprovalApplicationStorageAssetVehicleExt> allVehicleExts = new ArrayList<>();
+
for (OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item : assetItems) {
- // 根据数量创建对应数量的资产记录
- int quantity = item.getQuantity().intValue();
- for (int i = 0; i < quantity; i++) {
- AssetMain assetMain = buildAssetMainFromVehicle(item, applicationId, assetTypeId, storageDate, baseDto);
- assetMain.setAssetMainType(AssetTypeEnum.VEHICLE.getCode());
- assetMain.setQuantity(BigDecimal.ONE); // 每个资产记录数量为1
- assetMain.setTotalValue(item.getUnitPrice()); // 总价值等于单价
- allAssetMains.add(assetMain);
- }
+ OaApprovalApplicationStorageAsset assetMain = buildAssetMainFromVehicle(item, applicationId, assetTypeId, storageDate, baseDto);
+ assetMain.setAssetMainType(AssetTypeEnum.VEHICLE.getCode());
+ allAssetMains.add(assetMain);
}
// 批量保存资产主表数据
- assetMainService.saveBatch(allAssetMains);
+ oaApprovalApplicationStorageAssetService.saveBatch(allAssetMains);
// 为每个资产主表记录创建对应的扩展信息
- int assetMainIndex = 0;
- for (OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item : assetItems) {
- int quantity = item.getQuantity().intValue();
- for (int i = 0; i < quantity; i++) {
- AssetVehicleExt vehicleExt = buildAssetVehicleExt(item, allAssetMains.get(assetMainIndex).getId());
+ for (OaApprovalApplicationStorageAsset allAssetMain : allAssetMains) {
+ for (OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item : assetItems) {
+ OaApprovalApplicationStorageAssetVehicleExt vehicleExt = buildAssetVehicleExt(item, allAssetMain.getId());
allVehicleExts.add(vehicleExt);
- assetMainIndex++;
}
+
}
-
- assetVehicleExtService.saveBatch(allVehicleExts);
+ oaApprovalApplicationStorageAssetVehicleExtService.saveBatch(allVehicleExts);
}
/**
* 构建通用资产主表数据
*/
- private AssetMain buildAssetMain(OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageGeneralDTO baseDto) {
- AssetMain assetMain = new AssetMain();
+ private OaApprovalApplicationStorageAsset buildAssetMain(OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageGeneralDTO baseDto) {
+ OaApprovalApplicationStorageAsset assetMain = new OaApprovalApplicationStorageAsset();
assetMain.setApprovalApplicationId(applicationId.intValue());
assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
- assetMain.setAssetCode(generateAssetCode(assetTypeId, storageDate)); // 系统生成资产编码
assetMain.setAssetName(item.getAssetName());
assetMain.setCategory(item.getCategory());
assetMain.setSpecificationModel(item.getSpecificationModel());
@@ -266,8 +232,9 @@
}
assetMain.setUserName(item.getUserName());
// 根据整单 addressType 写入使用部门ID或仓库ID
- applyAddressToAssetMain(assetMain, baseDto.getAddressType(), baseDto.getUseDeptName(), baseDto.getWarehouseName(), baseDto.getAddress());
- assetMain.setAssetMainType(baseDto.getAddressType());
+ applyAddressToAssetMain(assetMain, item.getAddressType(), item.getUseDeptName(), item.getWarehouseName(), item.getAddress());
+ assetMain.setAddressType(item.getAddressType());
+ assetMain.setAssetMainType(AssetTypeEnum.GENERAL.getCode());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
assetMain.setAccountingStatus(item.getAccountingStatus());
@@ -282,11 +249,10 @@
/**
* 构建房产资产主表数据
*/
- private AssetMain buildAssetMainFromProperty(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStoragePropertyDTO baseDto) {
- AssetMain assetMain = new AssetMain();
+ private OaApprovalApplicationStorageAsset buildAssetMainFromProperty(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStoragePropertyDTO baseDto) {
+ OaApprovalApplicationStorageAsset assetMain = new OaApprovalApplicationStorageAsset();
assetMain.setApprovalApplicationId(applicationId.intValue());
assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
- assetMain.setAssetCode(generateAssetCode(assetTypeId, storageDate));
assetMain.setAssetName(item.getAssetName());
assetMain.setCategory(item.getCategory());
assetMain.setSpecificationModel(item.getSpecificationModel());
@@ -303,8 +269,9 @@
}
}
assetMain.setUserName(item.getUserName());
- applyAddressToAssetMain(assetMain, baseDto.getAddressType(), baseDto.getUseDeptName(), baseDto.getWarehouseName(), baseDto.getAddress());
- assetMain.setAssetMainType(baseDto.getAddressType());
+ applyAddressToAssetMain(assetMain, item.getAddressType(), item.getUseDeptName(), item.getWarehouseName(), item.getAddress());
+ assetMain.setAddressType(item.getAddressType());
+ assetMain.setAssetMainType(AssetTypeEnum.HOUSE.getCode());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
assetMain.setAccountingStatus(item.getAccountingStatus());
@@ -319,11 +286,10 @@
/**
* 构建车辆资产主表数据
*/
- private AssetMain buildAssetMainFromVehicle(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageVehicleDTO baseDto) {
- AssetMain assetMain = new AssetMain();
+ private OaApprovalApplicationStorageAsset buildAssetMainFromVehicle(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageVehicleDTO baseDto) {
+ OaApprovalApplicationStorageAsset assetMain = new OaApprovalApplicationStorageAsset();
assetMain.setApprovalApplicationId(applicationId.intValue());
assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
- assetMain.setAssetCode(generateAssetCode(assetTypeId, storageDate));
assetMain.setAssetName(item.getAssetName());
assetMain.setCategory(item.getCategory());
assetMain.setSpecificationModel(item.getSpecificationModel());
@@ -340,8 +306,9 @@
}
}
assetMain.setUserName(item.getUserName());
- applyAddressToAssetMain(assetMain, baseDto.getAddressType(), baseDto.getUseDeptName(), baseDto.getWarehouseName(), baseDto.getAddress());
- assetMain.setAssetMainType(baseDto.getAddressType());
+ applyAddressToAssetMain(assetMain, item.getAddressType(), item.getUseDeptName(), item.getWarehouseName(), item.getAddress());
+ assetMain.setAddressType(item.getAddressType());
+ assetMain.setAssetMainType(AssetTypeEnum.VEHICLE.getCode());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
assetMain.setAccountingStatus(item.getAccountingStatus());
@@ -356,7 +323,7 @@
/**
* 按整单地址类型设置资产主表位置信息（使用部门ID或仓库ID或地址）
*/
- private void applyAddressToAssetMain(AssetMain assetMain, Integer addressType, String useDeptName, String warehouseName, String address) {
+ private void applyAddressToAssetMain(OaApprovalApplicationStorageAsset assetMain, Integer addressType, String useDeptName, String warehouseName, String address) {
if (addressType == null) {
return;
}
@@ -393,22 +360,14 @@
}
}
- /**
- * 构建通用资产扩展数据
- */
- private AssetGeneralExt buildAssetGeneralExt(OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item, Integer assetMainId) {
- AssetGeneralExt generalExt = new AssetGeneralExt();
- generalExt.setAssetMainId(assetMainId);
- generalExt.setDisabled(false);
- return generalExt;
- }
+
/**
* 构建房产资产扩展数据
*/
- private AssetPropertyExt buildAssetPropertyExt(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer assetMainId) {
- AssetPropertyExt propertyExt = new AssetPropertyExt();
- propertyExt.setAssetMainId(assetMainId);
+ private OaApprovalApplicationStorageAssetPropertyExt buildAssetPropertyExt(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer assetMainId) {
+ OaApprovalApplicationStorageAssetPropertyExt propertyExt = new OaApprovalApplicationStorageAssetPropertyExt();
+ propertyExt.setStorageAssetId(assetMainId);
propertyExt.setRegion(item.getRegion());
propertyExt.setDesignPurpose(item.getDesignPurpose());
propertyExt.setBuilding(item.getBuilding());
@@ -432,9 +391,9 @@
/**
* 构建车辆资产扩展数据
*/
- private AssetVehicleExt buildAssetVehicleExt(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer assetMainId) {
- AssetVehicleExt vehicleExt = new AssetVehicleExt();
- vehicleExt.setAssetMainId(assetMainId);
+ private OaApprovalApplicationStorageAssetVehicleExt buildAssetVehicleExt(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer assetMainId) {
+ OaApprovalApplicationStorageAssetVehicleExt vehicleExt = new OaApprovalApplicationStorageAssetVehicleExt();
+ vehicleExt.setStorageAssetId(assetMainId);
vehicleExt.setLicensePlate(item.getLicensePlate());
vehicleExt.setVinCode(item.getVinCode());
vehicleExt.setEngineNumber(item.getEngineNumber());
@@ -557,31 +516,6 @@
return prefix + sequenceStr;
}
- /**
- * 生成资产编码
- * 格式：资产类型一级分类简写+资产类型子类简写+入库日期+【-】+数量顺序编号（4位）
- * 例如：GDFC20250917-0001
- */
- private String generateAssetCode(Integer assetTypeId, LocalDate storageDate) {
- // 根据资产类型ID获取资产编码前缀
- String typeCodePrefix = assetTypeService.getAssetCodePrefix(assetTypeId);
-
- String dateStr = storageDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- String prefix = typeCodePrefix + dateStr + "-";
-
- // 查询当天该类型资产的数量
- Long count = assetMainService.lambdaQuery()
- .like(AssetMain::getAssetCode, prefix)
- .ge(AssetMain::getCreateTime, storageDate.atStartOfDay())
- .lt(AssetMain::getCreateTime, storageDate.plusDays(1).atStartOfDay())
- .count();
-
- int sequence = (count != null ? count.intValue() : 0) + 1;
- String sequenceStr = String.format("%04d", sequence);
-
- return prefix + sequenceStr;
- }
-
@Override
public IPage<OaApprovalApplicationStoragePageVO> getPageList(OaApprovalApplicationStoragePageQuery pageQuery) {
Page<OaApprovalApplicationStoragePageVO> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
@@ -602,41 +536,39 @@
OaApprovalApplicationStorageGeneralDetailVO vo = new OaApprovalApplicationStorageGeneralDetailVO();
fillBaseFields(vo, app, storage);
- List<AssetMain> mains = assetMainService.lambdaQuery()
- .eq(AssetMain::getApprovalApplicationId, app.getId())
- .eq(AssetMain::getAssetTypeId, storage.getAssetTypeId())
+ List<OaApprovalApplicationStorageAsset> mains = oaApprovalApplicationStorageAssetService.lambdaQuery()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
+ .eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
.list();
- setAddressInfo(vo, mains);
-
if (!CollectionUtils.isEmpty(mains)) {
- List<Integer> mainIds = mains.stream().map(AssetMain::getId).collect(Collectors.toList());
- // 批量查询权属部门，避免循环内查询
- List<Integer> ownerIds = mains.stream().map(AssetMain::getOwnershipDeptId)
- .filter(id -> id != null).distinct().collect(Collectors.toList());
- Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? java.util.Collections.emptyMap()
+ // 批量查询权属部门
+ List<Integer> ownerIds = mains.stream().map(OaApprovalApplicationStorageAsset::getOwnershipDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? Collections.emptyMap()
: tDeptService.listByIds(ownerIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
-
+ // 批量查询使用部门
+ List<Integer> useDeptIds = mains.stream().map(OaApprovalApplicationStorageAsset::getUseDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> useDeptMap = ownerIds.isEmpty() ? Collections.emptyMap()
+ : tDeptService.listByIds(useDeptIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询仓库
+ List<Integer> warehouseIds = mains.stream().map(OaApprovalApplicationStorageAsset::getWarehouseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, AssetWarehouse> warehouseMap = warehouseIds.isEmpty() ? Collections.emptyMap()
+ : assetWarehouseService.listByIds(useDeptIds).stream().collect(Collectors.toMap(AssetWarehouse::getId, d -> d));
List<OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO> items = mains.stream().map(m -> {
- OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO item = new OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO();
- item.setAssetOriginalCode(m.getAssetOriginalCode());
- item.setAssetName(m.getAssetName());
- item.setSpecificationModel(m.getSpecificationModel());
- item.setMeasurementUnit(m.getMeasurementUnit());
- item.setQuantity(m.getQuantity());
- item.setUnitPrice(m.getUnitPrice());
- item.setUsefulLife(m.getUsefulLife());
+ OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO item = BeanUtil.copyProperties(m, OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO.class);
if (m.getOwnershipDeptId() != null) {
TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
}
- item.setUserName(m.getUserName());
- item.setAssetStatus(m.getAssetStatus());
- item.setRemarks(m.getRemarks());
- item.setAccountingStatus(m.getAccountingStatus());
- item.setAccountingDate(m.getAccountingDate());
- item.setAccountingVoucherNo(m.getAccountingVoucherNo());
- item.setAccountingSubject(m.getAccountingSubject());
- item.setAccountingAmount(m.getAccountingAmount());
+ if (m.getAddressType().equals(0) && m.getUseDeptId() != null) {
+ TDept dept = useDeptMap.get(m.getUseDeptId());
+ item.setUseDeptName(dept != null ? dept.getDeptName() : null);
+ } else if (m.getAddressType().equals(1) && m.getWarehouseId() != null){
+ AssetWarehouse assetWarehouse = warehouseMap.get(m.getWarehouseId());
+ item.setWarehouseName(assetWarehouse != null ? assetWarehouse.getWarehouseName() : null);
+ }
return item;
}).collect(Collectors.toList());
vo.setAssetItems(items);
@@ -658,44 +590,45 @@
OaApprovalApplicationStoragePropertyDetailVO vo = new OaApprovalApplicationStoragePropertyDetailVO();
fillBaseFields(vo, app, storage);
- List<AssetMain> mains = assetMainService.lambdaQuery()
- .eq(AssetMain::getApprovalApplicationId, app.getId())
- .eq(AssetMain::getAssetTypeId, storage.getAssetTypeId())
+ List<OaApprovalApplicationStorageAsset> mains = oaApprovalApplicationStorageAssetService.lambdaQuery()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
+ .eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
.list();
- setAddressInfo(vo, mains);
if (!CollectionUtils.isEmpty(mains)) {
- List<Integer> mainIds = mains.stream().map(AssetMain::getId).collect(Collectors.toList());
- List<AssetPropertyExt> exts = assetPropertyExtService.lambdaQuery().in(AssetPropertyExt::getAssetMainId, mainIds).list();
- Map<Integer, AssetPropertyExt> extMap = exts.stream().collect(Collectors.toMap(AssetPropertyExt::getAssetMainId, e -> e));
+ List<Integer> mainIds = mains.stream().map(OaApprovalApplicationStorageAsset::getId).collect(Collectors.toList());
+ List<OaApprovalApplicationStorageAssetPropertyExt> exts = oaApprovalApplicationStorageAssetPropertyExtService.lambdaQuery().in(OaApprovalApplicationStorageAssetPropertyExt::getStorageAssetId, mainIds).list();
+ Map<Integer, OaApprovalApplicationStorageAssetPropertyExt> extMap = exts.stream().collect(Collectors.toMap(OaApprovalApplicationStorageAssetPropertyExt::getStorageAssetId, e -> e));
// 批量查询权属部门
- List<Integer> ownerIds = mains.stream().map(AssetMain::getOwnershipDeptId)
+ List<Integer> ownerIds = mains.stream().map(OaApprovalApplicationStorageAsset::getOwnershipDeptId)
.filter(id -> id != null).distinct().collect(Collectors.toList());
Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? java.util.Collections.emptyMap()
: tDeptService.listByIds(ownerIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询使用部门
+ List<Integer> useDeptIds = mains.stream().map(OaApprovalApplicationStorageAsset::getUseDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> useDeptMap = ownerIds.isEmpty() ? Collections.emptyMap()
+ : tDeptService.listByIds(useDeptIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询仓库
+ List<Integer> warehouseIds = mains.stream().map(OaApprovalApplicationStorageAsset::getWarehouseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, AssetWarehouse> warehouseMap = warehouseIds.isEmpty() ? Collections.emptyMap()
+ : assetWarehouseService.listByIds(useDeptIds).stream().collect(Collectors.toMap(AssetWarehouse::getId, d -> d));
List<OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO> items = mains.stream().map(m -> {
- OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO item = new OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO();
- item.setAssetOriginalCode(m.getAssetOriginalCode());
- item.setAssetName(m.getAssetName());
- item.setSpecificationModel(m.getSpecificationModel());
- item.setMeasurementUnit(m.getMeasurementUnit());
- item.setQuantity(m.getQuantity());
- item.setUnitPrice(m.getUnitPrice());
- item.setUsefulLife(m.getUsefulLife());
+ OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO item = BeanUtil.copyProperties(m, OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO.class);
if (m.getOwnershipDeptId() != null) {
TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
}
- item.setUserName(m.getUserName());
- item.setAssetStatus(m.getAssetStatus());
- item.setRemarks(m.getRemarks());
- item.setAccountingStatus(m.getAccountingStatus());
- item.setAccountingDate(m.getAccountingDate());
- item.setAccountingVoucherNo(m.getAccountingVoucherNo());
- item.setAccountingSubject(m.getAccountingSubject());
- item.setAccountingAmount(m.getAccountingAmount());
- AssetPropertyExt ext = extMap.get(m.getId());
+ if (m.getAddressType().equals(0) && m.getUseDeptId() != null) {
+ TDept dept = useDeptMap.get(m.getUseDeptId());
+ item.setUseDeptName(dept != null ? dept.getDeptName() : null);
+ } else if (m.getAddressType().equals(1) && m.getWarehouseId() != null){
+ AssetWarehouse assetWarehouse = warehouseMap.get(m.getWarehouseId());
+ item.setWarehouseName(assetWarehouse != null ? assetWarehouse.getWarehouseName() : null);
+ }
+ OaApprovalApplicationStorageAssetPropertyExt ext = extMap.get(m.getId());
if (ext != null) {
item.setRegion(ext.getRegion());
item.setDesignPurpose(ext.getDesignPurpose());
@@ -735,44 +668,44 @@
OaApprovalApplicationStorageVehicleDetailVO vo = new OaApprovalApplicationStorageVehicleDetailVO();
fillBaseFields(vo, app, storage);
- List<AssetMain> mains = assetMainService.lambdaQuery()
- .eq(AssetMain::getApprovalApplicationId, app.getId())
- .eq(AssetMain::getAssetTypeId, storage.getAssetTypeId())
+ List<OaApprovalApplicationStorageAsset> mains = oaApprovalApplicationStorageAssetService.lambdaQuery()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
+ .eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
.list();
- setAddressInfo(vo, mains);
if (!CollectionUtils.isEmpty(mains)) {
- List<Integer> mainIds = mains.stream().map(AssetMain::getId).collect(Collectors.toList());
- List<AssetVehicleExt> exts = assetVehicleExtService.lambdaQuery().in(AssetVehicleExt::getAssetMainId, mainIds).list();
- Map<Integer, AssetVehicleExt> extMap = exts.stream().collect(Collectors.toMap(AssetVehicleExt::getAssetMainId, e -> e));
+ List<Integer> mainIds = mains.stream().map(OaApprovalApplicationStorageAsset::getId).collect(Collectors.toList());
+ List<OaApprovalApplicationStorageAssetVehicleExt> exts = oaApprovalApplicationStorageAssetVehicleExtService.lambdaQuery().in(OaApprovalApplicationStorageAssetVehicleExt::getStorageAssetId, mainIds).list();
+ Map<Integer, OaApprovalApplicationStorageAssetVehicleExt> extMap = exts.stream().collect(Collectors.toMap(OaApprovalApplicationStorageAssetVehicleExt::getStorageAssetId, e -> e));
// 批量查询权属部门
- List<Integer> ownerIds = mains.stream().map(AssetMain::getOwnershipDeptId)
+ List<Integer> ownerIds = mains.stream().map(OaApprovalApplicationStorageAsset::getOwnershipDeptId)
.filter(id -> id != null).distinct().collect(Collectors.toList());
Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? java.util.Collections.emptyMap()
: tDeptService.listByIds(ownerIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
-
+ // 批量查询使用部门
+ List<Integer> useDeptIds = mains.stream().map(OaApprovalApplicationStorageAsset::getUseDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> useDeptMap = ownerIds.isEmpty() ? Collections.emptyMap()
+ : tDeptService.listByIds(useDeptIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询仓库
+ List<Integer> warehouseIds = mains.stream().map(OaApprovalApplicationStorageAsset::getWarehouseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, AssetWarehouse> warehouseMap = warehouseIds.isEmpty() ? Collections.emptyMap()
+ : assetWarehouseService.listByIds(useDeptIds).stream().collect(Collectors.toMap(AssetWarehouse::getId, d -> d));
List<OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO> items = mains.stream().map(m -> {
- OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO item = new OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO();
- item.setAssetOriginalCode(m.getAssetOriginalCode());
- item.setAssetName(m.getAssetName());
- item.setSpecificationModel(m.getSpecificationModel());
- item.setMeasurementUnit(m.getMeasurementUnit());
- item.setQuantity(m.getQuantity());
- item.setUnitPrice(m.getUnitPrice());
- item.setUsefulLife(m.getUsefulLife());
+ OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO item = BeanUtil.copyProperties(m, OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO.class);
if (m.getOwnershipDeptId() != null) {
TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
}
- item.setUserName(m.getUserName());
- item.setAssetStatus(m.getAssetStatus());
- item.setRemarks(m.getRemarks());
- item.setAccountingStatus(m.getAccountingStatus());
- item.setAccountingDate(m.getAccountingDate());
- item.setAccountingVoucherNo(m.getAccountingVoucherNo());
- item.setAccountingSubject(m.getAccountingSubject());
- item.setAccountingAmount(m.getAccountingAmount());
- AssetVehicleExt ext = extMap.get(m.getId());
+ if (m.getAddressType().equals(0) && m.getUseDeptId() != null) {
+ TDept dept = useDeptMap.get(m.getUseDeptId());
+ item.setUseDeptName(dept != null ? dept.getDeptName() : null);
+ } else if (m.getAddressType().equals(1) && m.getWarehouseId() != null){
+ AssetWarehouse assetWarehouse = warehouseMap.get(m.getWarehouseId());
+ item.setWarehouseName(assetWarehouse != null ? assetWarehouse.getWarehouseName() : null);
+ }
+ OaApprovalApplicationStorageAssetVehicleExt ext = extMap.get(m.getId());
if (ext != null) {
item.setLicensePlate(ext.getLicensePlate());
item.setVinCode(ext.getVinCode());
@@ -830,49 +763,6 @@
v.setAssetTypeId(storage.getAssetTypeId());
v.setStorageType(storage.getStorageType());
v.setStorageTime(storage.getStorageTime());
- }
- }
-
- private void setAddressInfo(Object vo, List<AssetMain> mains) {
- if (CollectionUtils.isEmpty(mains)) {
- return;
- }
- AssetMain sample = mains.get(0);
- Integer addressType = null;
- String useDeptName = null;
- String warehouseName = null;
- String address = null;
- if (sample.getUseDeptId() != null) {
- addressType = 0;
- TDept dept = tDeptService.getById(sample.getUseDeptId());
- useDeptName = dept != null ? dept.getDeptName() : null;
- } else if (sample.getWarehouseId() != null) {
- addressType = 1;
- AssetWarehouse wh = assetWarehouseService.getById(sample.getWarehouseId());
- warehouseName = wh != null ? wh.getWarehouseName() : null;
- } else if (sample.getAddress() != null && !sample.getAddress().isEmpty()) {
- addressType = 2;
- address = sample.getAddress();
- }
-
- if (vo instanceof OaApprovalApplicationStorageGeneralDetailVO) {
- OaApprovalApplicationStorageGeneralDetailVO v = (OaApprovalApplicationStorageGeneralDetailVO) vo;
- v.setAddressType(addressType);
- v.setUseDeptName(useDeptName);
- v.setWarehouseName(warehouseName);
- v.setAddress(address);
- } else if (vo instanceof OaApprovalApplicationStoragePropertyDetailVO) {
- OaApprovalApplicationStoragePropertyDetailVO v = (OaApprovalApplicationStoragePropertyDetailVO) vo;
- v.setAddressType(addressType);
- v.setUseDeptName(useDeptName);
- v.setWarehouseName(warehouseName);
- v.setAddress(address);
- } else if (vo instanceof OaApprovalApplicationStorageVehicleDetailVO) {
- OaApprovalApplicationStorageVehicleDetailVO v = (OaApprovalApplicationStorageVehicleDetailVO) vo;
- v.setAddressType(addressType);
- v.setUseDeptName(useDeptName);
- v.setWarehouseName(warehouseName);
- v.setAddress(address);
}
}
--
Gitblit v1.7.1