From de04015a9eaf4a9928a1cba6cdfceed03146a720 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 20:06:07 +0800
Subject: [PATCH] 项目启动流程、变更流程逻辑调整
---
flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index bae5779..d2d5a45 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -113,12 +113,14 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables) {
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
if (Objects.isNull(task)) {
return AjaxResult.error("浠诲姟涓嶅瓨鍦�");
}
-// variables.put(taskId + "formJson", variables.get("formJson"));
+ // 鍏堣褰撳墠鐢ㄦ埛璁ら杩欎釜浠诲姟
+ taskService.claim(taskId, SecurityUtils.getUserId() + "");
taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "瀹屾垚鎻愪氦");
taskService.complete(taskId, variables);
return AjaxResult.success("鎻愪氦鎴愬姛");
@@ -1136,7 +1138,7 @@
JSONObject oldVariables = JSONObject.parseObject(JSON.toJSONString(parameters.get("formJson")));
if (Objects.isNull(oldVariables)) {
- // 濡傛灉鏄┖鐨勶紝鐩存帴浣跨敤涓昏〃鍗�
+ // 濡傛灉鏄┖鐨勶紝鐩存帴浣跨敤涓昏〃鍗曪紝鍥犱负杩欎唬琛ㄦ槸娴佺▼涓殑绗竴涓彁浜よ〃鍗曠殑浠诲姟
String deploymentId = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getDeploymentId();
return this.flowFormData(deploymentId);
}
--
Gitblit v1.8.0