From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmProcessDefinitionService.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmProcessDefinitionService.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmProcessDefinitionService.java
index 5b9fa15..0788948 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmProcessDefinitionService.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmProcessDefinitionService.java
@@ -1,6 +1,7 @@
package com.iailab.module.bpm.service.definition;
import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
import com.iailab.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO;
import com.iailab.module.bpm.dal.dataobject.definition.BpmFormDO;
import com.iailab.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
@@ -40,7 +41,7 @@
* @param suspensionState 中断状态
* @return 流程定义列表
*/
- List<ProcessDefinition> getProcessDefinitionListBySuspensionState(Integer suspensionState);
+ List<ProcessDefinition> getProcessDefinitionListBySuspensionState(Integer suspensionState, String categoryId);
/**
* 基于流程模型，创建流程定义
@@ -48,10 +49,12 @@
* @param model 流程模型
* @param modelMetaInfo 流程模型元信息
* @param bpmnBytes BPMN XML 字节数组
+ * @param simpleJson SIMPLE Model JSON
* @param form 表单
* @return 流程编号
*/
- String createProcessDefinition(Model model, BpmModelMetaInfoRespDTO modelMetaInfo, byte[] bpmnBytes, BpmFormDO form);
+ String createProcessDefinition(Model model, BpmModelMetaInfoVO modelMetaInfo,
+ byte[] bpmnBytes, String simpleJson, BpmFormDO form);
/**
* 更新流程定义状态
@@ -60,6 +63,14 @@
* @param state 状态
*/
void updateProcessDefinitionState(String id, Integer state);
+
+ /**
+ * 更新模型编号
+ *
+ * @param modelId 流程定义编号
+ * @param sort 排序
+ */
+ void updateProcessDefinitionSortByModelId(String modelId, Long sort);
/**
* 获得流程定义对应的 BPMN
@@ -134,6 +145,15 @@
ProcessDefinition getActiveProcessDefinition(String key);
/**
+ * 判断用户是否可以使用该流程定义，进行流程的发起
+ *
+ * @param processDefinition 流程定义
+ * @param userId 用户编号
+ * @return 是否可以发起流程
+ */
+ boolean canUserStartProcessDefinition(BpmProcessDefinitionInfoDO processDefinition, Long userId);
+
+ /**
* 获得 ids 对应的 Deployment Map
*
* @param ids 部署编号的数组
--
Gitblit v1.9.3