From 867e7bf66562dbc00d76ca17d6eeb3d553257b28 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期一, 03 六月 2024 21:03:58 +0800
Subject: [PATCH] update 调整模型部署错误 添加获取流程实例id接口
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java | 8 ++++++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java | 6 ++++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java | 4 +++-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java | 20 +++++++++++++++++++-
script/bpmn/模型.zip | 0
5 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java
index 58cb063..4e556c9 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java
@@ -65,4 +65,12 @@
* @param variables 娴佺▼鍙橀噺
*/
void setVariablesLocal(String taskId, Map<String, Object> variables);
+
+ /**
+ * 鎸夌収涓氬姟id鏌ヨ娴佺▼瀹炰緥id
+ *
+ * @param businessKey 涓氬姟id
+ * @return 缁撴灉
+ */
+ String getInstanceIdByBusinessKey(String businessKey);
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
index 47886d7..b1c9b9e 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
@@ -67,4 +67,10 @@
@ExcelProperty(value = "鐘舵��")
private String status;
+ /**
+ * 娴佺▼瀹炰緥id
+ */
+ @ExcelProperty(value = "娴佺▼瀹炰緥id")
+ private String processInstanceId;
+
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
index 6431b3f..9d14bc8 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
@@ -46,7 +46,9 @@
*/
@Override
public TestLeaveVo queryById(Long id) {
- return baseMapper.selectVoById(id);
+ TestLeaveVo testLeaveVo = baseMapper.selectVoById(id);
+ testLeaveVo.setProcessInstanceId(workflowService.getInstanceIdByBusinessKey(String.valueOf(id)));
+ return testLeaveVo;
}
/**
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
index 2c60b66..11f6ef1 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
@@ -1,7 +1,10 @@
package org.dromara.workflow.service.impl;
+import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.service.WorkflowService;
+import org.dromara.workflow.domain.ActHiProcinst;
+import org.dromara.workflow.service.IActHiProcinstService;
import org.dromara.workflow.service.IActProcessInstanceService;
import org.dromara.workflow.utils.WorkflowUtils;
import org.flowable.engine.RuntimeService;
@@ -21,7 +24,7 @@
private final IActProcessInstanceService iActProcessInstanceService;
private final RuntimeService runtimeService;
-
+ private final IActHiProcinstService iActHiProcinstService;
/**
* 杩愯涓殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
*
@@ -98,4 +101,19 @@
public void setVariablesLocal(String taskId, Map<String, Object> variables) {
runtimeService.setVariablesLocal(taskId, variables);
}
+
+ /**
+ * 鎸夌収涓氬姟id鏌ヨ娴佺▼瀹炰緥id
+ *
+ * @param businessKey 涓氬姟id
+ * @return 缁撴灉
+ */
+ @Override
+ public String getInstanceIdByBusinessKey(String businessKey) {
+ ActHiProcinst actHiProcinst = iActHiProcinstService.selectByBusinessKey(businessKey);
+ if (actHiProcinst == null) {
+ return StrUtil.EMPTY;
+ }
+ return actHiProcinst.getId();
+ }
}
diff --git "a/script/bpmn/\346\250\241\345\236\213.zip" "b/script/bpmn/\346\250\241\345\236\213.zip"
index f232cda..6f30952 100644
--- "a/script/bpmn/\346\250\241\345\236\213.zip"
+++ "b/script/bpmn/\346\250\241\345\236\213.zip"
Binary files differ
--
Gitblit v1.9.3