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 | 582 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 419 insertions(+), 163 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 a043153..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,9 +1,11 @@
package com.ruoyi.system.service.impl;
-import cn.hutool.core.collection.CollUtil;
+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;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageGeneralDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStoragePropertyDTO;
@@ -12,21 +14,41 @@
import com.ruoyi.system.emums.ApprovalTypeEnum;
import com.ruoyi.system.emums.AssetTypeEnum;
import com.ruoyi.system.mapper.OaApprovalApplicationStorageMapper;
-import com.ruoyi.system.model.*;
-import com.ruoyi.system.service.*;
+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.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.OaApprovalApplicationsService;
+import com.ruoyi.system.service.OaApprovalFlowNodeService;
+import com.ruoyi.system.service.OaApprovalTodoService;
+import com.ruoyi.system.service.TDeptService;
+import com.ruoyi.system.vo.StorageListVO;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageGeneralDetailVO;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePropertyDetailVO;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageVehicleDetailVO;
import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -42,15 +64,13 @@
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;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -71,7 +91,7 @@
save(storage);
// 5. 保存通用资产数据
- saveGeneralAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime());
+ saveGeneralAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime(), dto);
}
@Override
@@ -93,7 +113,7 @@
save(storage);
// 5. 保存房产资产数据
- savePropertyAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime());
+ savePropertyAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime(), dto);
}
@Override
@@ -115,137 +135,106 @@
save(storage);
// 5. 保存车辆资产数据
- saveVehicleAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime());
+ saveVehicleAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime(), dto);
}
/**
* 保存通用资产数据
*/
- private void saveGeneralAssets(List<OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
- List<AssetMain> allAssetMains = new ArrayList<>();
- List<AssetGeneralExt> allGeneralExts = new ArrayList<>();
-
+ private void saveGeneralAssets(List<OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageGeneralDTO baseDto) {
+ 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);
- 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);
-
- // 为每个资产主表记录创建对应的扩展信息
- int assetMainIndex = 0;
- for (OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item : assetItems) {
- int quantity = item.getQuantity().intValue();
- for (int i = 0; i < quantity; i++) {
- AssetGeneralExt generalExt = buildAssetGeneralExt(item, allAssetMains.get(assetMainIndex).getId());
- allGeneralExts.add(generalExt);
- assetMainIndex++;
- }
- }
-
- assetGeneralExtService.saveBatch(allGeneralExts);
+ oaApprovalApplicationStorageAssetService.saveBatch(storageAssets);
}
/**
* 保存房产资产数据
*/
- private void savePropertyAssets(List<OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
- List<AssetMain> allAssetMains = new ArrayList<>();
- List<AssetPropertyExt> allPropertyExts = new ArrayList<>();
+ private void savePropertyAssets(List<OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStoragePropertyDTO baseDto) {
+ 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);
- 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) {
- List<AssetMain> allAssetMains = new ArrayList<>();
- List<AssetVehicleExt> allVehicleExts = new ArrayList<>();
-
+ private void saveVehicleAssets(List<OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageVehicleDTO baseDto) {
+ 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);
- 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) {
- 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());
assetMain.setAssetTypeId(assetTypeId);
assetMain.setMeasurementUnit(item.getMeasurementUnit());
assetMain.setUnitPrice(item.getUnitPrice());
assetMain.setUsefulLife(item.getUsefulLife());
- assetMain.setOwnershipDeptId(item.getOwnershipDeptId());
+ // 根据权属单位/部门名称填充ID
+ if (item.getOwnershipDeptName() != null && !item.getOwnershipDeptName().isEmpty()) {
+ TDept ownerDept = tDeptService.lambdaQuery()
+ .eq(TDept::getDeptName, item.getOwnershipDeptName())
+ .one();
+ if (ownerDept != null) {
+ assetMain.setOwnershipDeptId(ownerDept.getId());
+ }
+ }
assetMain.setUserName(item.getUserName());
- assetMain.setUseDeptId(item.getUseDeptId());
- assetMain.setWarehouseId(item.getWarehouseId());
- assetMain.setWarehouseName(item.getWarehouseName());
- assetMain.setAddress(item.getAddress());
+ // 根据整单 addressType 写入使用部门ID或仓库ID
+ 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());
@@ -260,23 +249,29 @@
/**
* 构建房产资产主表数据
*/
- private AssetMain buildAssetMainFromProperty(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
- 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());
assetMain.setAssetTypeId(assetTypeId);
assetMain.setMeasurementUnit(item.getMeasurementUnit());
assetMain.setUnitPrice(item.getUnitPrice());
assetMain.setUsefulLife(item.getUsefulLife());
- assetMain.setOwnershipDeptId(item.getOwnershipDeptId());
+ if (item.getOwnershipDeptName() != null && !item.getOwnershipDeptName().isEmpty()) {
+ TDept ownerDept = tDeptService.lambdaQuery()
+ .eq(TDept::getDeptName, item.getOwnershipDeptName())
+ .one();
+ if (ownerDept != null) {
+ assetMain.setOwnershipDeptId(ownerDept.getId());
+ }
+ }
assetMain.setUserName(item.getUserName());
- assetMain.setUseDeptId(item.getUseDeptId());
- assetMain.setWarehouseId(item.getWarehouseId());
- assetMain.setWarehouseName(item.getWarehouseName());
- assetMain.setAddress(item.getAddress());
+ 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());
@@ -291,23 +286,29 @@
/**
* 构建车辆资产主表数据
*/
- private AssetMain buildAssetMainFromVehicle(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
- 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());
assetMain.setAssetTypeId(assetTypeId);
assetMain.setMeasurementUnit(item.getMeasurementUnit());
assetMain.setUnitPrice(item.getUnitPrice());
assetMain.setUsefulLife(item.getUsefulLife());
- assetMain.setOwnershipDeptId(item.getOwnershipDeptId());
+ if (item.getOwnershipDeptName() != null && !item.getOwnershipDeptName().isEmpty()) {
+ TDept ownerDept = tDeptService.lambdaQuery()
+ .eq(TDept::getDeptName, item.getOwnershipDeptName())
+ .one();
+ if (ownerDept != null) {
+ assetMain.setOwnershipDeptId(ownerDept.getId());
+ }
+ }
assetMain.setUserName(item.getUserName());
- assetMain.setUseDeptId(item.getUseDeptId());
- assetMain.setWarehouseId(item.getWarehouseId());
- assetMain.setWarehouseName(item.getWarehouseName());
- assetMain.setAddress(item.getAddress());
+ 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());
@@ -320,31 +321,53 @@
}
/**
- * 构建通用资产扩展数据
+ * 按整单地址类型设置资产主表位置信息（使用部门ID或仓库ID或地址）
*/
- private AssetGeneralExt buildAssetGeneralExt(OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item, Integer assetMainId) {
- AssetGeneralExt generalExt = new AssetGeneralExt();
- generalExt.setAssetMainId(assetMainId);
- generalExt.setSupplierName(item.getSupplierName());
- generalExt.setPurchaseDate(item.getPurchaseDate());
- generalExt.setWarrantyPeriod(item.getWarrantyPeriod());
- generalExt.setWarrantyExpireDate(item.getWarrantyExpireDate());
- generalExt.setDepreciationMethod(item.getDepreciationMethod());
- generalExt.setDepreciationRate(item.getDepreciationRate());
- generalExt.setNetValue(item.getNetValue());
- generalExt.setMaintenanceCycle(item.getMaintenanceCycle());
- generalExt.setLastMaintenanceDate(item.getLastMaintenanceDate());
- generalExt.setNextMaintenanceDate(item.getNextMaintenanceDate());
- generalExt.setDisabled(false);
- return generalExt;
+ private void applyAddressToAssetMain(OaApprovalApplicationStorageAsset assetMain, Integer addressType, String useDeptName, String warehouseName, String address) {
+ if (addressType == null) {
+ return;
+ }
+ switch (addressType) {
+ case 0:
+ // 使用部门
+ if (useDeptName != null && !useDeptName.isEmpty()) {
+ TDept dept = tDeptService.lambdaQuery()
+ .eq(TDept::getDeptName, useDeptName)
+ .one();
+ if (dept != null) {
+ assetMain.setUseDeptId(dept.getId());
+ }
+ }
+ break;
+ case 1:
+ if (warehouseName != null && !warehouseName.isEmpty()) {
+ AssetWarehouse warehouse = assetWarehouseService.lambdaQuery()
+ .eq(AssetWarehouse::getWarehouseName, warehouseName)
+ .one();
+ if (warehouse != null) {
+ assetMain.setWarehouseId(warehouse.getId());
+ assetMain.setWarehouseName(warehouse.getWarehouseName());
+ }
+ }
+ break;
+ case 2:
+ if (address != null && !address.isEmpty()) {
+ assetMain.setAddress(address);
+ }
+ break;
+ default:
+ // ignore
+ }
}
+
+
/**
* 构建房产资产扩展数据
*/
- 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());
@@ -356,7 +379,7 @@
propertyExt.setDetailedLocation(item.getDetailedLocation());
propertyExt.setProvincialPlatformValue(item.getProvincialPlatformValue());
propertyExt.setResettlementSituation(item.getResettlementSituation());
- propertyExt.setIsMortgaged(item.getIsMortgaged());
+ propertyExt.setMortgaged(item.getMortgaged());
propertyExt.setTenantName(item.getTenantName());
propertyExt.setRentalAmount(item.getRentalAmount());
propertyExt.setLeaseStartDate(item.getLeaseStartDate());
@@ -368,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());
@@ -407,14 +430,14 @@
private OaApprovalApplications buildOaApprovalApplications(Object dto) {
OaApprovalApplications applications = new OaApprovalApplications();
applications.setApprovalId(ApprovalTypeEnum.IN_STOCK.getCode());
-
+ applications.setApplicationDate(LocalDate.now());
if (dto instanceof OaApprovalApplicationStorageGeneralDTO) {
OaApprovalApplicationStorageGeneralDTO generalDTO = (OaApprovalApplicationStorageGeneralDTO) dto;
applications.setApplicantUserId(generalDTO.getApplicantUserId());
applications.setApplicantName(generalDTO.getApplicantName());
applications.setDeptId(generalDTO.getDeptId());
applications.setDeptName(generalDTO.getDeptName());
- applications.setApplicationDate(generalDTO.getApplicationDate());
+ applications.setApplicationDate(LocalDate.now());
applications.setApplicationReason(generalDTO.getApplicationReason());
applications.setAttachmentUrl(generalDTO.getAttachmentUrl());
} else if (dto instanceof OaApprovalApplicationStoragePropertyDTO) {
@@ -423,7 +446,7 @@
applications.setApplicantName(propertyDTO.getApplicantName());
applications.setDeptId(propertyDTO.getDeptId());
applications.setDeptName(propertyDTO.getDeptName());
- applications.setApplicationDate(propertyDTO.getApplicationDate());
+ applications.setApplicationDate(LocalDate.now());
applications.setApplicationReason(propertyDTO.getApplicationReason());
applications.setAttachmentUrl(propertyDTO.getAttachmentUrl());
} else if (dto instanceof OaApprovalApplicationStorageVehicleDTO) {
@@ -432,7 +455,7 @@
applications.setApplicantName(vehicleDTO.getApplicantName());
applications.setDeptId(vehicleDTO.getDeptId());
applications.setDeptName(vehicleDTO.getDeptName());
- applications.setApplicationDate(vehicleDTO.getApplicationDate());
+ applications.setApplicationDate(LocalDate.now());
applications.setApplicationReason(vehicleDTO.getApplicationReason());
applications.setAttachmentUrl(vehicleDTO.getAttachmentUrl());
}
@@ -493,28 +516,261 @@
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());
+ return this.baseMapper.selectApplicationStoragePage(page, pageQuery);
+ }
+
+ @Override
+ public OaApprovalApplicationStorageGeneralDetailVO getGeneralDetail(Integer storageId) {
+ OaApprovalApplicationStorage storage = this.getById(storageId);
+ if (storage == null) {
+ throw new ServiceException("入库申请不存在");
+ }
+ OaApprovalApplications app = oaApprovalApplicationsService.getById(storage.getApprovalApplicationId());
+ if (app == null) {
+ throw new ServiceException("审批主记录不存在");
+ }
+
+ OaApprovalApplicationStorageGeneralDetailVO vo = new OaApprovalApplicationStorageGeneralDetailVO();
+ fillBaseFields(vo, app, storage);
+
+ List<OaApprovalApplicationStorageAsset> mains = oaApprovalApplicationStorageAssetService.lambdaQuery()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
+ .eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
+ .list();
+ if (!CollectionUtils.isEmpty(mains)) {
+ // 批量查询权属部门
+ 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 = BeanUtil.copyProperties(m, OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO.class);
+ if (m.getOwnershipDeptId() != null) {
+ TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
+ item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
+ }
+ 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);
+ }
+ return vo;
+ }
+
+ @Override
+ public OaApprovalApplicationStoragePropertyDetailVO getPropertyDetail(Integer storageId) {
+ OaApprovalApplicationStorage storage = this.getById(storageId);
+ if (storage == null) {
+ throw new ServiceException("入库申请不存在");
+ }
+ OaApprovalApplications app = oaApprovalApplicationsService.getById(storage.getApprovalApplicationId());
+ if (app == null) {
+ throw new ServiceException("审批主记录不存在");
+ }
+
+ OaApprovalApplicationStoragePropertyDetailVO vo = new OaApprovalApplicationStoragePropertyDetailVO();
+ fillBaseFields(vo, app, storage);
+
+ List<OaApprovalApplicationStorageAsset> mains = oaApprovalApplicationStorageAssetService.lambdaQuery()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
+ .eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
+ .list();
+
+ if (!CollectionUtils.isEmpty(mains)) {
+ 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(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 = BeanUtil.copyProperties(m, OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO.class);
+ if (m.getOwnershipDeptId() != null) {
+ TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
+ item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
+ }
+ 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());
+ item.setBuilding(ext.getBuilding());
+ item.setRoomNumber(ext.getRoomNumber());
+ item.setConstructionArea(ext.getConstructionArea());
+ item.setStructureType(ext.getStructureType());
+ item.setCertificateNumber(ext.getCertificateNumber());
+ item.setCompletionDate(ext.getCompletionDate());
+ item.setDetailedLocation(ext.getDetailedLocation());
+ item.setProvincialPlatformValue(ext.getProvincialPlatformValue());
+ item.setResettlementSituation(ext.getResettlementSituation());
+ item.setMortgaged(ext.getMortgaged());
+ item.setTenantName(ext.getTenantName());
+ item.setRentalAmount(ext.getRentalAmount());
+ item.setLeaseStartDate(ext.getLeaseStartDate());
+ item.setLeaseEndDate(ext.getLeaseEndDate());
+ }
+ return item;
+ }).collect(Collectors.toList());
+ vo.setAssetItems(items);
+ }
+ return vo;
+ }
+
+ @Override
+ public OaApprovalApplicationStorageVehicleDetailVO getVehicleDetail(Integer storageId) {
+ OaApprovalApplicationStorage storage = this.getById(storageId);
+ if (storage == null) {
+ throw new ServiceException("入库申请不存在");
+ }
+ OaApprovalApplications app = oaApprovalApplicationsService.getById(storage.getApprovalApplicationId());
+ if (app == null) {
+ throw new ServiceException("审批主记录不存在");
+ }
+
+ OaApprovalApplicationStorageVehicleDetailVO vo = new OaApprovalApplicationStorageVehicleDetailVO();
+ fillBaseFields(vo, app, storage);
+
+ List<OaApprovalApplicationStorageAsset> mains = oaApprovalApplicationStorageAssetService.lambdaQuery()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
+ .eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
+ .list();
+
+ if (!CollectionUtils.isEmpty(mains)) {
+ 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(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 = BeanUtil.copyProperties(m, OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO.class);
+ if (m.getOwnershipDeptId() != null) {
+ TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
+ item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
+ }
+ 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());
+ item.setEngineNumber(ext.getEngineNumber());
+ item.setDisplacement(ext.getDisplacement());
+ item.setStaffingSituation(ext.getStaffingSituation());
+ item.setOrigin(ext.getOrigin());
+ item.setAcquisitionDate(ext.getAcquisitionDate());
+ item.setPropertyRightForm(ext.getPropertyRightForm());
+ }
+ return item;
+ }).collect(Collectors.toList());
+ vo.setAssetItems(items);
+ }
+ return vo;
+ }
+
+ private void fillBaseFields(Object vo, OaApprovalApplications app, OaApprovalApplicationStorage storage) {
+ if (vo instanceof OaApprovalApplicationStorageGeneralDetailVO) {
+ OaApprovalApplicationStorageGeneralDetailVO v = (OaApprovalApplicationStorageGeneralDetailVO) vo;
+ v.setDeptId(app.getDeptId());
+ v.setDeptName(app.getDeptName());
+ v.setApplicantUserId(app.getApplicantUserId());
+ v.setApplicantName(app.getApplicantName());
+ v.setApplicationDate(app.getApplicationDate());
+ v.setApplicationReason(app.getApplicationReason());
+ v.setAttachmentUrl(app.getAttachmentUrl());
+ v.setTitle(storage.getTitle());
+ v.setAssetTypeId(storage.getAssetTypeId());
+ v.setStorageType(storage.getStorageType());
+ v.setStorageTime(storage.getStorageTime());
+ } else if (vo instanceof OaApprovalApplicationStoragePropertyDetailVO) {
+ OaApprovalApplicationStoragePropertyDetailVO v = (OaApprovalApplicationStoragePropertyDetailVO) vo;
+ v.setDeptId(app.getDeptId());
+ v.setDeptName(app.getDeptName());
+ v.setApplicantUserId(app.getApplicantUserId());
+ v.setApplicantName(app.getApplicantName());
+ v.setApplicationDate(app.getApplicationDate());
+ v.setApplicationReason(app.getApplicationReason());
+ v.setAttachmentUrl(app.getAttachmentUrl());
+ v.setTitle(storage.getTitle());
+ v.setAssetTypeId(storage.getAssetTypeId());
+ v.setStorageType(storage.getStorageType());
+ v.setStorageTime(storage.getStorageTime());
+ } else if (vo instanceof OaApprovalApplicationStorageVehicleDetailVO) {
+ OaApprovalApplicationStorageVehicleDetailVO v = (OaApprovalApplicationStorageVehicleDetailVO) vo;
+ v.setDeptId(app.getDeptId());
+ v.setDeptName(app.getDeptName());
+ v.setApplicantUserId(app.getApplicantUserId());
+ v.setApplicantName(app.getApplicantName());
+ v.setApplicationDate(app.getApplicationDate());
+ v.setApplicationReason(app.getApplicationReason());
+ v.setAttachmentUrl(app.getAttachmentUrl());
+ v.setTitle(storage.getTitle());
+ v.setAssetTypeId(storage.getAssetTypeId());
+ v.setStorageType(storage.getStorageType());
+ v.setStorageTime(storage.getStorageTime());
+ }
+ }
+
+ @Override
+ public PageInfo<StorageListVO> pageList(ApprovalDetailQuery query) {
+ PageInfo<StorageListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<StorageListVO> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
}
}
--
Gitblit v1.7.1