From ab2af1669c9169009ba15ec4a152185a262633e2 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期一, 25 三月 2024 23:30:05 +0800
Subject: [PATCH] add 添加流程办理校验，添加部署后如果流程定义最高版本有表单配置将此版本配置同步到部署得流程定义
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java
index 18969b1..0d59b85 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java
@@ -7,6 +7,8 @@
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.json.utils.JsonUtils;
@@ -32,9 +34,8 @@
*
* @author may
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ModelUtils {
- public ModelUtils() {
- }
public static BpmnModel xmlToBpmnModel(String xml) throws IOException {
if (xml == null) {
@@ -194,7 +195,7 @@
*
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
- public Map<String, List<ExtensionElement>> getExtensionElements(String processDefinitionId) {
+ public static Map<String, List<ExtensionElement>> getExtensionElements(String processDefinitionId) {
Map<String, List<ExtensionElement>> map = new HashMap<>();
List<FlowElement> flowElements = getFlowElements(processDefinitionId);
for (FlowElement flowElement : flowElements) {
@@ -211,10 +212,22 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
* @param flowElementId 鑺傜偣id
*/
- public Map<String, List<ExtensionElement>> getExtensionElement(String processDefinitionId, String flowElementId) {
+ public static Map<String, List<ExtensionElement>> getExtensionElement(String processDefinitionId, String flowElementId) {
BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(processDefinitionId);
Process process = bpmnModel.getMainProcess();
FlowElement flowElement = process.getFlowElement(flowElementId);
return flowElement.getExtensionElements();
}
+
+ /**
+ * 鍒ゆ柇褰撳墠鑺傜偣鏄惁涓虹敤鎴蜂换鍔�
+ *
+ * @param processDefinitionId 娴佺▼瀹氫箟id
+ * @param taskDefinitionKey 娴佺▼瀹氫箟id
+ */
+ public static boolean isUserTask(String processDefinitionId, String taskDefinitionKey) {
+ BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(processDefinitionId);
+ FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(taskDefinitionKey);
+ return flowNode instanceof UserTask;
+ }
}
--
Gitblit v1.9.3