From 87895ab581b2f44e3492e4395dce5fc7e8341363 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 17:00:48 +0800
Subject: [PATCH] 替换注化
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
index 237cbc1..e3c53f1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
@@ -23,6 +23,7 @@
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NodeDeptQueryService;
+import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springblade.mdm.utils.EntityUtil;
import org.springblade.mdm.utils.ProgramFileNameCheckUtil;
@@ -47,6 +48,7 @@
private final IdentityService identityService;
private final FlowProgramFileService flowProgramFileService;
private final ReplaceProgramFileService replaceProgramFileService;
+ private final ProgramFlowStatusQueryService flowStatusQueryService;
private final NodeDeptQueryService nodeDeptQueryService;
private OssTemplate ossTemplate;
public static final String NODE_ID = "nodeId";
@@ -79,8 +81,15 @@
*/
+ /**
+ * 鍑嗗鏇挎崲娴佺▼闇�瑕佺殑鏁版嵁
+ * @param nodeId 瑕佹浛鎹㈢殑绋嬪簭鍖呭悕鑺傜偣id
+ * @param tempInstanceId 涓存椂娴佺▼瀹炰緥id锛岀敤浜庢柊鐨勬枃浠�
+ * @return 鍚姩鏁版嵁
+ */
@Transactional
public NcNodeVO pre(long nodeId, String tempInstanceId) {
+ checkFlowStatus(nodeId);
List<NcNode> fileNodes = nodeService.lambdaQuery()
.eq(NcNode::getParentId, nodeId)
@@ -111,6 +120,14 @@
vo.setWorkshop(nodeDeptQueryService.getWorkshopNameByMachineCode(node.getMachineCode()));
return vo;
+ }
+
+ void checkFlowStatus(long nodeId) {
+ NcNode packageNode = nodeService.getById(nodeId);
+ int status = flowStatusQueryService.queryFlowStatus(packageNode.getProcessInstanceId());
+ if (status == 1) {
+ throw new ServiceException("绋嬪簭鐨勬祦绋嬫鍦ㄨ繘琛屼腑锛屼笉鑳借繘琛屾浛鎹�");
+ }
}
/**
@@ -190,7 +207,6 @@
progFile.setName(file.getOriginalFilename());
progFile.setOssName(bfile.getName());
progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
- progFile.setIsCured(0);
progFile.setProgramName(programName);
flowProgramFileService.save(progFile);
--
Gitblit v1.9.3