From 236fb6ff1f6a955db5f78560204e042e977e2167 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 20:47:52 +0800
Subject: [PATCH] 资产入库审批通过保存资产数据
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java | 756 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 756 insertions(+), 0 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 8526ff6..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,10 +1,55 @@
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;
+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;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageVehicleDTO;
+import com.ruoyi.system.emums.ApprovalStatusEnum;
+import com.ruoyi.system.emums.ApprovalTypeEnum;
+import com.ruoyi.system.emums.AssetTypeEnum;
import com.ruoyi.system.mapper.OaApprovalApplicationStorageMapper;
+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.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+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;
/**
* <p>
@@ -15,6 +60,717 @@
* @since 2025-09-15
*/
@Service
+@RequiredArgsConstructor
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 OaApprovalFlowNodeService oaApprovalFlowNodeService;
+ private final OaApprovalTodoService oaApprovalTodoService;
+ private final TDeptService tDeptService;
+ private final AssetWarehouseService assetWarehouseService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitGeneralAssetStorage(OaApprovalApplicationStorageGeneralDTO dto) {
+ // 1. 保存审批申请主表数据
+ OaApprovalApplications applications = buildOaApprovalApplications(dto);
+
+ // 2. 获取流程节点并创建待办
+ OaApprovalFlowNode firstFlowNode = getFirstFlowNode(ApprovalTypeEnum.IN_STOCK.getCode());
+ applications.setCurrentFlowNodeId(firstFlowNode.getId());
+ oaApprovalApplicationsService.save(applications);
+
+ // 3. 创建待办事项记录（公共服务）
+ oaApprovalTodoService.createApprovalTodos(applications.getId(), applications.getApplicationCode(), firstFlowNode, dto.getDeptId());
+
+ // 4. 保存资产入库申请明细数据
+ OaApprovalApplicationStorage storage = buildOaApprovalApplicationStorage(dto, applications.getId());
+ save(storage);
+
+ // 5. 保存通用资产数据
+ saveGeneralAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime(), dto);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitPropertyAssetStorage(OaApprovalApplicationStoragePropertyDTO dto) {
+ // 1. 保存审批申请主表数据
+ OaApprovalApplications applications = buildOaApprovalApplications(dto);
+
+ // 2. 获取流程节点并创建待办
+ OaApprovalFlowNode firstFlowNode = getFirstFlowNode(ApprovalTypeEnum.IN_STOCK.getCode());
+ applications.setCurrentFlowNodeId(firstFlowNode.getId());
+ oaApprovalApplicationsService.save(applications);
+
+ // 3. 创建待办事项记录（公共服务）
+ oaApprovalTodoService.createApprovalTodos(applications.getId(), applications.getApplicationCode(), firstFlowNode, dto.getDeptId());
+
+ // 4. 保存资产入库申请明细数据
+ OaApprovalApplicationStorage storage = buildOaApprovalApplicationStorage(dto, applications.getId());
+ save(storage);
+
+ // 5. 保存房产资产数据
+ savePropertyAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime(), dto);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitVehicleAssetStorage(OaApprovalApplicationStorageVehicleDTO dto) {
+ // 1. 保存审批申请主表数据
+ OaApprovalApplications applications = buildOaApprovalApplications(dto);
+
+ // 2. 获取流程节点并创建待办
+ OaApprovalFlowNode firstFlowNode = getFirstFlowNode(ApprovalTypeEnum.IN_STOCK.getCode());
+ applications.setCurrentFlowNodeId(firstFlowNode.getId());
+ oaApprovalApplicationsService.save(applications);
+
+ // 3. 创建待办事项记录（公共服务）
+ oaApprovalTodoService.createApprovalTodos(applications.getId(), applications.getApplicationCode(), firstFlowNode, dto.getDeptId());
+
+ // 4. 保存资产入库申请明细数据
+ OaApprovalApplicationStorage storage = buildOaApprovalApplicationStorage(dto, applications.getId());
+ save(storage);
+
+ // 5. 保存车辆资产数据
+ saveVehicleAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime(), dto);
+ }
+
+ /**
+ * 保存通用资产数据
+ */
+ 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) {
+ // 根据数量创建对应数量的资产记录
+ OaApprovalApplicationStorageAsset assetMain = buildAssetMain(item, applicationId, assetTypeId, storageDate, baseDto);
+ assetMain.setAssetMainType(AssetTypeEnum.GENERAL.getCode());
+ storageAssets.add(assetMain);
+ }
+ // 批量保存资产主表数据
+ oaApprovalApplicationStorageAssetService.saveBatch(storageAssets);
+ }
+
+ /**
+ * 保存房产资产数据
+ */
+ 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) {
+ OaApprovalApplicationStorageAsset assetMain = buildAssetMainFromProperty(item, applicationId, assetTypeId, storageDate, baseDto);
+ assetMain.setAssetMainType(AssetTypeEnum.HOUSE.getCode());
+ allAssetMains.add(assetMain);
+ }
+
+ // 批量保存资产主表数据
+ oaApprovalApplicationStorageAssetService.saveBatch(allAssetMains);
+
+ // 为每个资产主表记录创建对应的扩展信息
+ for (OaApprovalApplicationStorageAsset allAssetMain : allAssetMains) {
+ for (OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item : assetItems) {
+ OaApprovalApplicationStorageAssetPropertyExt propertyExt = buildAssetPropertyExt(item, allAssetMain.getId());
+ allPropertyExts.add(propertyExt);
+ }
+ }
+ oaApprovalApplicationStorageAssetPropertyExtService.saveBatch(allPropertyExts);
+ }
+
+ /**
+ * 保存车辆资产数据
+ */
+ 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) {
+ OaApprovalApplicationStorageAsset assetMain = buildAssetMainFromVehicle(item, applicationId, assetTypeId, storageDate, baseDto);
+ assetMain.setAssetMainType(AssetTypeEnum.VEHICLE.getCode());
+ allAssetMains.add(assetMain);
+ }
+
+ // 批量保存资产主表数据
+ oaApprovalApplicationStorageAssetService.saveBatch(allAssetMains);
+
+ // 为每个资产主表记录创建对应的扩展信息
+ for (OaApprovalApplicationStorageAsset allAssetMain : allAssetMains) {
+ for (OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item : assetItems) {
+ OaApprovalApplicationStorageAssetVehicleExt vehicleExt = buildAssetVehicleExt(item, allAssetMain.getId());
+ allVehicleExts.add(vehicleExt);
+ }
+
+ }
+ oaApprovalApplicationStorageAssetVehicleExtService.saveBatch(allVehicleExts);
+ }
+
+ /**
+ * 构建通用资产主表数据
+ */
+ 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.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());
+ // 根据权属单位/部门名称填充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());
+ // 根据整单 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());
+ assetMain.setAccountingDate(item.getAccountingDate());
+ assetMain.setAccountingVoucherNo(item.getAccountingVoucherNo());
+ assetMain.setAccountingSubject(item.getAccountingSubject());
+ assetMain.setAccountingAmount(item.getAccountingAmount());
+ assetMain.setDisabled(false);
+ return 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.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());
+ 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());
+ 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());
+ assetMain.setAccountingDate(item.getAccountingDate());
+ assetMain.setAccountingVoucherNo(item.getAccountingVoucherNo());
+ assetMain.setAccountingSubject(item.getAccountingSubject());
+ assetMain.setAccountingAmount(item.getAccountingAmount());
+ assetMain.setDisabled(false);
+ return 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.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());
+ 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());
+ 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());
+ assetMain.setAccountingDate(item.getAccountingDate());
+ assetMain.setAccountingVoucherNo(item.getAccountingVoucherNo());
+ assetMain.setAccountingSubject(item.getAccountingSubject());
+ assetMain.setAccountingAmount(item.getAccountingAmount());
+ assetMain.setDisabled(false);
+ return assetMain;
+ }
+
+ /**
+ * 按整单地址类型设置资产主表位置信息（使用部门ID或仓库ID或地址）
+ */
+ 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 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());
+ propertyExt.setRoomNumber(item.getRoomNumber());
+ propertyExt.setConstructionArea(item.getConstructionArea());
+ propertyExt.setStructureType(item.getStructureType());
+ propertyExt.setCertificateNumber(item.getCertificateNumber());
+ propertyExt.setCompletionDate(item.getCompletionDate());
+ propertyExt.setDetailedLocation(item.getDetailedLocation());
+ propertyExt.setProvincialPlatformValue(item.getProvincialPlatformValue());
+ propertyExt.setResettlementSituation(item.getResettlementSituation());
+ propertyExt.setMortgaged(item.getMortgaged());
+ propertyExt.setTenantName(item.getTenantName());
+ propertyExt.setRentalAmount(item.getRentalAmount());
+ propertyExt.setLeaseStartDate(item.getLeaseStartDate());
+ propertyExt.setLeaseEndDate(item.getLeaseEndDate());
+ propertyExt.setDisabled(false);
+ return propertyExt;
+ }
+
+ /**
+ * 构建车辆资产扩展数据
+ */
+ 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());
+ vehicleExt.setDisplacement(item.getDisplacement());
+ vehicleExt.setStaffingSituation(item.getStaffingSituation());
+ vehicleExt.setOrigin(item.getOrigin());
+ vehicleExt.setAcquisitionDate(item.getAcquisitionDate());
+ vehicleExt.setPropertyRightForm(item.getPropertyRightForm());
+ vehicleExt.setDisabled(false);
+ return vehicleExt;
+ }
+
+ /**
+ * 获取第一个流程节点
+ */
+ private OaApprovalFlowNode getFirstFlowNode(Integer approvalId) {
+ List<OaApprovalFlowNode> flowNodes = oaApprovalFlowNodeService.lambdaQuery()
+ .eq(OaApprovalFlowNode::getApprovalId, approvalId)
+ .eq(OaApprovalFlowNode::getStatus, 1)
+ .orderByAsc(OaApprovalFlowNode::getSortOrder)
+ .list();
+
+ if (CollectionUtils.isEmpty(flowNodes)) {
+ throw new ServiceException("未找到有效的审批流程配置");
+ }
+
+ return flowNodes.get(0);
+ }
+
+
+ /**
+ * 构建审批申请主表数据
+ */
+ 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(LocalDate.now());
+ applications.setApplicationReason(generalDTO.getApplicationReason());
+ applications.setAttachmentUrl(generalDTO.getAttachmentUrl());
+ } else if (dto instanceof OaApprovalApplicationStoragePropertyDTO) {
+ OaApprovalApplicationStoragePropertyDTO propertyDTO = (OaApprovalApplicationStoragePropertyDTO) dto;
+ applications.setApplicantUserId(propertyDTO.getApplicantUserId());
+ applications.setApplicantName(propertyDTO.getApplicantName());
+ applications.setDeptId(propertyDTO.getDeptId());
+ applications.setDeptName(propertyDTO.getDeptName());
+ applications.setApplicationDate(LocalDate.now());
+ applications.setApplicationReason(propertyDTO.getApplicationReason());
+ applications.setAttachmentUrl(propertyDTO.getAttachmentUrl());
+ } else if (dto instanceof OaApprovalApplicationStorageVehicleDTO) {
+ OaApprovalApplicationStorageVehicleDTO vehicleDTO = (OaApprovalApplicationStorageVehicleDTO) dto;
+ applications.setApplicantUserId(vehicleDTO.getApplicantUserId());
+ applications.setApplicantName(vehicleDTO.getApplicantName());
+ applications.setDeptId(vehicleDTO.getDeptId());
+ applications.setDeptName(vehicleDTO.getDeptName());
+ applications.setApplicationDate(LocalDate.now());
+ applications.setApplicationReason(vehicleDTO.getApplicationReason());
+ applications.setAttachmentUrl(vehicleDTO.getAttachmentUrl());
+ }
+
+ applications.setApplicationCode(generateApplicationCode());
+ applications.setDisabled(0);
+ applications.setApprovalStatus(ApprovalStatusEnum.PENDING.getCode());
+ return applications;
+ }
+
+ /**
+ * 构建资产入库申请明细数据
+ */
+ private OaApprovalApplicationStorage buildOaApprovalApplicationStorage(Object dto, Integer applicationId) {
+ OaApprovalApplicationStorage storage = new OaApprovalApplicationStorage();
+ storage.setApprovalApplicationId(applicationId.intValue());
+
+ if (dto instanceof OaApprovalApplicationStorageGeneralDTO) {
+ OaApprovalApplicationStorageGeneralDTO generalDTO = (OaApprovalApplicationStorageGeneralDTO) dto;
+ storage.setTitle(generalDTO.getTitle());
+ storage.setAssetTypeId(generalDTO.getAssetTypeId());
+ storage.setStorageType(generalDTO.getStorageType());
+ storage.setStorageTime(generalDTO.getStorageTime());
+ } else if (dto instanceof OaApprovalApplicationStoragePropertyDTO) {
+ OaApprovalApplicationStoragePropertyDTO propertyDTO = (OaApprovalApplicationStoragePropertyDTO) dto;
+ storage.setTitle(propertyDTO.getTitle());
+ storage.setAssetTypeId(propertyDTO.getAssetTypeId());
+ storage.setStorageType(propertyDTO.getStorageType());
+ storage.setStorageTime(propertyDTO.getStorageTime());
+ } else if (dto instanceof OaApprovalApplicationStorageVehicleDTO) {
+ OaApprovalApplicationStorageVehicleDTO vehicleDTO = (OaApprovalApplicationStorageVehicleDTO) dto;
+ storage.setTitle(vehicleDTO.getTitle());
+ storage.setAssetTypeId(vehicleDTO.getAssetTypeId());
+ storage.setStorageType(vehicleDTO.getStorageType());
+ storage.setStorageTime(vehicleDTO.getStorageTime());
+ }
+
+ return storage;
+ }
+
+ /**
+ * 生成申请单号
+ * 格式：RK + 年月日 + 3位序号
+ */
+ private String generateApplicationCode() {
+ String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String prefix = "RK" + dateStr;
+
+ Long count = oaApprovalApplicationsService.lambdaQuery()
+ .like(OaApprovalApplications::getApplicationCode, prefix)
+ .ge(OaApprovalApplications::getCreateTime, LocalDate.now().atStartOfDay())
+ .lt(OaApprovalApplications::getCreateTime, LocalDate.now().plusDays(1).atStartOfDay())
+ .count();
+
+ int sequence = (count != null ? count.intValue() : 0) + 1;
+ String sequenceStr = String.format("%03d", 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