From 358e4f19e130045ce58c2313435baec2a3f11b61 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 25 二月 2025 10:47:58 +0800
Subject: [PATCH] 审批流
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index b144e21..b25418c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -141,7 +141,7 @@
// 更新模板, version+1
StateProcessTemplate processTemplate = new StateProcessTemplate();
- processTemplate.setId(IdUtils.simpleUUID());
+ processTemplate.setId(processUpdateBO.getId());
processTemplate.setWorkFlowId(deployId);
processTemplate.setWorkflowVersion(flwProcess.getProcessVersion());
processTemplate.setTemplateName(processUpdateBO.getTemplateName());
@@ -152,20 +152,20 @@
processTemplate.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
processTemplate.setUpdateTime(LocalDateTime.now());
processTemplate.setTemplateVersion(temp.getTemplateVersion() + 1);
- this.save(processTemplate);
+ return this.updateById(processTemplate);
//查询版本是否绑定流程，更新
- LambdaQueryWrapper<StateProcessModule> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(StateProcessModule::getTemplateId, processUpdateBO.getId());
- List<StateProcessModule> stateProcessModules = stateProcessModuleService.list(queryWrapper);
- if (Objects.isNull(stateProcessModules) || stateProcessModules.isEmpty()) {
- return true;
- }
- for (StateProcessModule stateProcessModule : stateProcessModules) {
- stateProcessModule.setTemplateId(processTemplate.getId());
- stateProcessModule.setTemplateName(processTemplate.getTemplateName());
- }
- return stateProcessModuleService.updateBatchById(stateProcessModules);
+// LambdaQueryWrapper<StateProcessModule> queryWrapper = new LambdaQueryWrapper<>();
+// queryWrapper.eq(StateProcessModule::getTemplateId, processUpdateBO.getId());
+// List<StateProcessModule> stateProcessModules = stateProcessModuleService.list(queryWrapper);
+// if (Objects.isNull(stateProcessModules) || stateProcessModules.isEmpty()) {
+// return true;
+// }
+// for (StateProcessModule stateProcessModule : stateProcessModules) {
+// stateProcessModule.setTemplateId(processTemplate.getId());
+// stateProcessModule.setTemplateName(processTemplate.getTemplateName());
+// }
+// return stateProcessModuleService.updateBatchById(stateProcessModules);
}
/**
@@ -249,7 +249,9 @@
//监听器参数补全
processStartBO.getVariable().put("category", processStartBO.getCategory());
// 开启流程
- flowLongEngine.startInstanceById(flwProcess.getId(), creator, processStartBO.getVariable()).ifPresent(instance -> {
+ Optional<FlwInstance> flwInstanceOptional = flowLongEngine.startInstanceById(flwProcess.getId(), creator, processStartBO.getVariable());
+ if(flwInstanceOptional.isPresent()){
+ FlwInstance instance = flwInstanceOptional.get();
//存储任务中心信息
StateTaskCenter stateTaskCenter = new StateTaskCenter();
stateTaskCenter.setId(IdUtils.simpleUUID());
@@ -279,7 +281,7 @@
//保存version
stateProcessExtInstance.setProcessVersion(flwProcess.getProcessVersion());
stateProcessExtInstanceService.save(stateProcessExtInstance);
- });
+ }
return true;
}
--
Gitblit v1.7.1