From 78734a8efcd97dbe75c9d898783e402996a65f48 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 5 Dec 2025 11:17:53 +0800 Subject: [PATCH] fix:bug --- .../impl/dataFileHandle/UploadApproveStrategy.java | 7 +++++++ .../project/service/impl/SimulationRunServiceImpl.java | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/data/src/main/java/com/sdm/data/service/impl/dataFileHandle/UploadApproveStrategy.java b/data/src/main/java/com/sdm/data/service/impl/dataFileHandle/UploadApproveStrategy.java index 5c65838f..89b14801 100644 --- a/data/src/main/java/com/sdm/data/service/impl/dataFileHandle/UploadApproveStrategy.java +++ b/data/src/main/java/com/sdm/data/service/impl/dataFileHandle/UploadApproveStrategy.java @@ -3,6 +3,7 @@ package com.sdm.data.service.impl.dataFileHandle; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.sdm.common.entity.constants.NumberConstants; import com.sdm.common.entity.enums.ApproveFileDataTypeEnum; +import com.sdm.common.entity.enums.ApproveTypeEnum; import com.sdm.data.model.entity.*; import com.sdm.data.service.*; import lombok.extern.slf4j.Slf4j; @@ -25,6 +26,7 @@ public class UploadApproveStrategy implements ApproveStrategy { IFileUserPermissionService fileUserPermissionService = context.getFileUserPermissionService(); IFileStorageService fileStorageService = context.getFileStorageService(); IFileSimulationMappingService fileSimulationMappingService = context.getFileSimulationMappingService(); + ISimulationParameterLibraryCategoryObjectService paramObjectService = context.getParamObjectService(); // 审批通过 if (NumberConstants.TWO == status) { @@ -50,6 +52,11 @@ public class UploadApproveStrategy implements ApproveStrategy { fileMetadataExtensionService.remove(new LambdaQueryWrapper().in(FileMetadataExtension::getTFilemetaId, removeIds)); fileUserPermissionService.remove(new LambdaQueryWrapper().in(FileUserPermission::getTFilemetaId, removeIds)); fileSimulationMappingService.remove(new LambdaQueryWrapper().in(FileSimulationMapping::getFileId, removeIds)); + + // 如果是参数库审批 删除参数库对象 记录操作日志 + if (ApproveTypeEnum.PARAM_APPROVE.getCode() == context.getApproveType()) { + paramObjectService.remove(new LambdaQueryWrapper().in(SimulationParameterLibraryCategoryObject::getFileId, removeIds)); + } return true; } return false; diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index 693b9da4..915cda1a 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -35,10 +35,7 @@ import com.sdm.common.feign.impl.system.ApproveFeignClientImpl; import com.sdm.common.feign.impl.system.SysUserFeignClientImpl; import com.sdm.common.utils.PageUtils; import com.sdm.common.utils.RandomUtil; -import com.sdm.project.common.KeyResultTypeEnum; -import com.sdm.project.common.MemberTypeEnum; -import com.sdm.project.common.RunPerformanceStatusEnum; -import com.sdm.project.common.TaskExeStatusEnum; +import com.sdm.project.common.*; import com.sdm.project.dao.SimulationProjectMapper; import com.sdm.project.dao.SimulationRunMapper; import com.sdm.project.model.bo.ApprovalDeliverableContentsModel; @@ -1202,7 +1199,10 @@ public class SimulationRunServiceImpl extends ServiceImpl sdmResponse = flowableFeignClient.startByProcessDefinitionId(simulationRun.getProcessDefinitionId(), Collections.emptyMap()); if (sdmResponse.getData() != null) { - this.lambdaUpdate().set(SimulationRun::getFlowInstanceId, sdmResponse.getData().getProcessInstanceId()).eq(SimulationRun::getUuid, req.getRunId()).update(); + this.lambdaUpdate() + .set(SimulationRun::getFlowInstanceId, sdmResponse.getData().getProcessInstanceId()) + .set(SimulationRun::getStatus, RunStatusEnum.RUNNING.getCode()) + .eq(SimulationRun::getUuid, req.getRunId()).update(); flowableFeignClient.updateNodeParamProcessInstanceId(simulationRun.getProcessDefinitionId(), sdmResponse.getData().getProcessInstanceId()); } else { return SdmResponse.failed("流程实例启动失败");