From 27d8f8fbb2e02be63338b80f808969faa35adac0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 11:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java | 559 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 559 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..f56632b 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,49 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.entity.TDept;
+import com.ruoyi.common.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.AssetGeneralExt;
+import com.ruoyi.system.model.AssetMain;
+import com.ruoyi.system.model.AssetPropertyExt;
+import com.ruoyi.system.model.AssetVehicleExt;
+import com.ruoyi.system.model.AssetWarehouse;
import com.ruoyi.system.model.OaApprovalApplicationStorage;
+import com.ruoyi.system.model.OaApprovalApplications;
+import com.ruoyi.system.model.OaApprovalFlowNode;
+import com.ruoyi.system.service.AssetGeneralExtService;
+import com.ruoyi.system.service.AssetMainService;
+import com.ruoyi.system.service.AssetPropertyExtService;
+import com.ruoyi.system.service.AssetTypeService;
+import com.ruoyi.system.service.AssetVehicleExtService;
+import com.ruoyi.system.service.AssetWarehouseService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.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.OaApprovalApplicationStoragePageVO;
+import lombok.RequiredArgsConstructor;
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.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -15,6 +54,526 @@
* @since 2025-09-15
*/
@Service
+@RequiredArgsConstructor
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 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)
+ 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<AssetMain> allAssetMains = new ArrayList<>();
+ List<AssetGeneralExt> allGeneralExts = new ArrayList<>();
+
+ for (OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item : assetItems) {
+ // 根据数量创建对应数量的资产记录
+ int quantity = item.getQuantity().intValue();
+ for (int i = 0; i < quantity; i++) {
+ AssetMain assetMain = buildAssetMain(item, applicationId, assetTypeId, storageDate, baseDto);
+ assetMain.setAssetMainType(AssetTypeEnum.GENERAL.getCode());
+ assetMain.setQuantity(BigDecimal.ONE); // 每个资产记录数量为1
+ assetMain.setTotalValue(item.getUnitPrice()); // 总价值等于单价
+ allAssetMains.add(assetMain);
+ }
+ }
+
+ // 批量保存资产主表数据
+ 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);
+ }
+
+ /**
+ * 保存房产资产数据
+ */
+ private void savePropertyAssets(List<OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStoragePropertyDTO baseDto) {
+ List<AssetMain> allAssetMains = new ArrayList<>();
+ List<AssetPropertyExt> allPropertyExts = new ArrayList<>();
+
+ for (OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item : assetItems) {
+ // 根据数量创建对应数量的资产记录
+ int quantity = item.getQuantity().intValue();
+ for (int i = 0; i < quantity; i++) {
+ AssetMain assetMain = buildAssetMainFromProperty(item, applicationId, assetTypeId, storageDate, baseDto);
+ assetMain.setAssetMainType(AssetTypeEnum.HOUSE.getCode());
+ assetMain.setQuantity(BigDecimal.ONE); // 每个资产记录数量为1
+ assetMain.setTotalValue(item.getUnitPrice()); // 总价值等于单价
+ allAssetMains.add(assetMain);
+ }
+ }
+
+ // 批量保存资产主表数据
+ assetMainService.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());
+ allPropertyExts.add(propertyExt);
+ assetMainIndex++;
+ }
+ }
+
+ assetPropertyExtService.saveBatch(allPropertyExts);
+ }
+
+ /**
+ * 保存车辆资产数据
+ */
+ private void saveVehicleAssets(List<OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageVehicleDTO baseDto) {
+ List<AssetMain> allAssetMains = new ArrayList<>();
+ List<AssetVehicleExt> allVehicleExts = new ArrayList<>();
+
+ for (OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item : assetItems) {
+ // 根据数量创建对应数量的资产记录
+ int quantity = item.getQuantity().intValue();
+ for (int i = 0; i < quantity; i++) {
+ AssetMain assetMain = buildAssetMainFromVehicle(item, applicationId, assetTypeId, storageDate, baseDto);
+ assetMain.setAssetMainType(AssetTypeEnum.VEHICLE.getCode());
+ assetMain.setQuantity(BigDecimal.ONE); // 每个资产记录数量为1
+ assetMain.setTotalValue(item.getUnitPrice()); // 总价值等于单价
+ allAssetMains.add(assetMain);
+ }
+ }
+
+ // 批量保存资产主表数据
+ assetMainService.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());
+ allVehicleExts.add(vehicleExt);
+ assetMainIndex++;
+ }
+ }
+
+ assetVehicleExtService.saveBatch(allVehicleExts);
+ }
+
+ /**
+ * 构建通用资产主表数据
+ */
+ private AssetMain buildAssetMain(OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageGeneralDTO baseDto) {
+ AssetMain assetMain = new AssetMain();
+ assetMain.setApprovalApplicationId(applicationId.intValue());
+ assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
+ assetMain.setAssetCode(generateAssetCode(assetTypeId, storageDate)); // 系统生成资产编码
+ assetMain.setAssetName(item.getAssetName());
+ assetMain.setSpecificationModel(item.getSpecificationModel());
+ assetMain.setAssetTypeId(assetTypeId);
+ assetMain.setMeasurementUnit(item.getMeasurementUnit());
+ assetMain.setUnitPrice(item.getUnitPrice());
+ assetMain.setUsefulLife(item.getUsefulLife());
+ assetMain.setOwnershipDeptId(item.getOwnershipDeptId());
+ assetMain.setUserName(item.getUserName());
+ // 根据整单 addressType 写入使用部门ID或仓库ID
+ applyAddressToAssetMain(assetMain, baseDto.getAddressType(), baseDto.getUseDeptName(), baseDto.getWarehouseName(), baseDto.getAddress());
+ assetMain.setAssetMainType(baseDto.getAddressType());
+ 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 AssetMain buildAssetMainFromProperty(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStoragePropertyDTO baseDto) {
+ AssetMain assetMain = new AssetMain();
+ assetMain.setApprovalApplicationId(applicationId.intValue());
+ assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
+ assetMain.setAssetCode(generateAssetCode(assetTypeId, storageDate));
+ assetMain.setAssetName(item.getAssetName());
+ assetMain.setSpecificationModel(item.getSpecificationModel());
+ assetMain.setAssetTypeId(assetTypeId);
+ assetMain.setMeasurementUnit(item.getMeasurementUnit());
+ assetMain.setUnitPrice(item.getUnitPrice());
+ assetMain.setUsefulLife(item.getUsefulLife());
+ assetMain.setOwnershipDeptId(item.getOwnershipDeptId());
+ assetMain.setUserName(item.getUserName());
+ applyAddressToAssetMain(assetMain, baseDto.getAddressType(), baseDto.getUseDeptName(), baseDto.getWarehouseName(), baseDto.getAddress());
+ assetMain.setAssetMainType(baseDto.getAddressType());
+ 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 AssetMain buildAssetMainFromVehicle(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageVehicleDTO baseDto) {
+ AssetMain assetMain = new AssetMain();
+ assetMain.setApprovalApplicationId(applicationId.intValue());
+ assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
+ assetMain.setAssetCode(generateAssetCode(assetTypeId, storageDate));
+ assetMain.setAssetName(item.getAssetName());
+ assetMain.setSpecificationModel(item.getSpecificationModel());
+ assetMain.setAssetTypeId(assetTypeId);
+ assetMain.setMeasurementUnit(item.getMeasurementUnit());
+ assetMain.setUnitPrice(item.getUnitPrice());
+ assetMain.setUsefulLife(item.getUsefulLife());
+ assetMain.setOwnershipDeptId(item.getOwnershipDeptId());
+ assetMain.setUserName(item.getUserName());
+ applyAddressToAssetMain(assetMain, baseDto.getAddressType(), baseDto.getUseDeptName(), baseDto.getWarehouseName(), baseDto.getAddress());
+ assetMain.setAssetMainType(baseDto.getAddressType());
+ 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(AssetMain 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 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 AssetPropertyExt buildAssetPropertyExt(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer assetMainId) {
+ AssetPropertyExt propertyExt = new AssetPropertyExt();
+ propertyExt.setAssetMainId(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.setIsMortgaged(item.getIsMortgaged());
+ propertyExt.setTenantName(item.getTenantName());
+ propertyExt.setRentalAmount(item.getRentalAmount());
+ propertyExt.setLeaseStartDate(item.getLeaseStartDate());
+ propertyExt.setLeaseEndDate(item.getLeaseEndDate());
+ propertyExt.setDisabled(false);
+ return propertyExt;
+ }
+
+ /**
+ * 构建车辆资产扩展数据
+ */
+ private AssetVehicleExt buildAssetVehicleExt(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer assetMainId) {
+ AssetVehicleExt vehicleExt = new AssetVehicleExt();
+ vehicleExt.setAssetMainId(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(generalDTO.getApplicationDate());
+ 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(propertyDTO.getApplicationDate());
+ 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(vehicleDTO.getApplicationDate());
+ 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;
+ }
+
+ /**
+ * 生成资产编码
+ * 格式：资产类型一级分类简写+资产类型子类简写+入库日期+【-】+数量顺序编号（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(com.ruoyi.system.query.OaApprovalApplicationStoragePageQuery pageQuery) {
+ Page<OaApprovalApplicationStoragePageVO> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+ return this.baseMapper.selectApplicationStoragePage(page, pageQuery);
+ }
}
--
Gitblit v1.7.1