From 206c1338ae6f5100cb408fb02a2095e211c0521f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 16:51:03 +0800
Subject: [PATCH] 资产入库联调修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java | 564 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 428 insertions(+), 136 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..6332ff5 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,9 @@
package com.ruoyi.system.service.impl;
-import cn.hutool.core.collection.CollUtil;
+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.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 +12,42 @@
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.AssetMain;
+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.OaApprovalApplicationStoragePageQuery;
+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.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.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.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -42,15 +63,17 @@
public class OaApprovalApplicationStorageServiceImpl extends ServiceImpl<OaApprovalApplicationStorageMapper, OaApprovalApplicationStorage> implements OaApprovalApplicationStorageService {
private final OaApprovalApplicationsService oaApprovalApplicationsService;
+ private final OaApprovalApplicationStorageAssetService oaApprovalApplicationStorageAssetService;
+ private final OaApprovalApplicationStorageAssetPropertyExtService oaApprovalApplicationStorageAssetPropertyExtService;
+ private final OaApprovalApplicationStorageAssetVehicleExtService oaApprovalApplicationStorageAssetVehicleExtService;
private final AssetMainService assetMainService;
- private final AssetGeneralExtService assetGeneralExtService;
private final AssetPropertyExtService assetPropertyExtService;
private final AssetVehicleExtService assetVehicleExtService;
private final AssetTypeService assetTypeService;
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 +94,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 +116,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 +138,105 @@
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
+ applyUseDeptInfoToAssetMain(assetMain, baseDto.getUseDeptName());
+ assetMain.setAssetMainType(AssetTypeEnum.GENERAL.getCode());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
assetMain.setAccountingStatus(item.getAccountingStatus());
@@ -260,23 +251,28 @@
/**
* 构建房产资产主表数据
*/
- 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());
+ applyUseDeptInfoToAssetMain(assetMain, baseDto.getUseDeptName());
+ assetMain.setAssetMainType(AssetTypeEnum.HOUSE.getCode());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
assetMain.setAccountingStatus(item.getAccountingStatus());
@@ -291,23 +287,28 @@
/**
* 构建车辆资产主表数据
*/
- 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());
+ applyUseDeptInfoToAssetMain(assetMain, baseDto.getUseDeptName());
+ assetMain.setAssetMainType(AssetTypeEnum.VEHICLE.getCode());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
assetMain.setAccountingStatus(item.getAccountingStatus());
@@ -320,31 +321,27 @@
}
/**
- * 构建通用资产扩展数据
+ * 按整单地址类型设置资产主表位置信息（使用部门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 applyUseDeptInfoToAssetMain(OaApprovalApplicationStorageAsset assetMain, String useDeptName) {
+ // 使用部门
+ if (useDeptName != null && !useDeptName.isEmpty()) {
+ TDept dept = tDeptService.lambdaQuery()
+ .eq(TDept::getDeptName, useDeptName)
+ .one();
+ if (dept != null) {
+ assetMain.setUseDeptId(dept.getId());
+ }
+ }
}
+
/**
* 构建房产资产扩展数据
*/
- 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 +353,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 +365,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 +404,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 +420,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 +429,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());
}
@@ -517,4 +514,299 @@
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();
+ setAddressInfo(vo, mains);
+
+ if (!CollectionUtils.isEmpty(mains)) {
+ // 批量查询权属部门，避免循环内查询
+ 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<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());
+ 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());
+ 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();
+ setAddressInfo(vo, mains);
+
+ 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<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());
+ 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());
+ 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();
+ setAddressInfo(vo, mains);
+
+ 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<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());
+ 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());
+ 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());
+ }
+ }
+
+ private void setAddressInfo(Object vo, List<OaApprovalApplicationStorageAsset> mains) {
+ if (CollectionUtils.isEmpty(mains)) {
+ return;
+ }
+ OaApprovalApplicationStorageAsset sample = mains.get(0);
+ Integer addressType = null;
+ String useDeptName = null;
+ String warehouseName = null;
+ String address = null;
+ switch (sample.getAddressType()) {
+ case 0:
+ TDept dept = tDeptService.getById(sample.getUseDeptId());
+ useDeptName = dept != null ? dept.getDeptName() : null;
+ break;
+ case 1:
+ AssetWarehouse wh = assetWarehouseService.getById(sample.getWarehouseId());
+ warehouseName = wh != null ? wh.getWarehouseName() : null;
+ break;
+ case 2:
+ break;
+ default:
+ return;
+ }
+
+ if (vo instanceof OaApprovalApplicationStorageGeneralDetailVO) {
+ OaApprovalApplicationStorageGeneralDetailVO v = (OaApprovalApplicationStorageGeneralDetailVO) vo;
+ v.setAddressType(sample.getAddressType());
+ v.setUseDeptName(useDeptName);
+ v.setWarehouseName(warehouseName);
+ v.setAddress(sample.getAddress());
+ } else if (vo instanceof OaApprovalApplicationStoragePropertyDetailVO) {
+ OaApprovalApplicationStoragePropertyDetailVO v = (OaApprovalApplicationStoragePropertyDetailVO) vo;
+ v.setAddressType(sample.getAddressType());
+ v.setUseDeptName(useDeptName);
+ v.setWarehouseName(warehouseName);
+ v.setAddress(sample.getAddress());
+ } else if (vo instanceof OaApprovalApplicationStorageVehicleDetailVO) {
+ OaApprovalApplicationStorageVehicleDetailVO v = (OaApprovalApplicationStorageVehicleDetailVO) vo;
+ v.setAddressType(sample.getAddressType());
+ v.setUseDeptName(useDeptName);
+ v.setWarehouseName(warehouseName);
+ v.setAddress(sample.getAddress());
+ }
+ }
}
--
Gitblit v1.7.1