From f7b0c64785d8f64ee9b628808f1022f8460bab5e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 21 六月 2020 16:21:18 +0800
Subject: [PATCH] 优化流程图
---
service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
index 60627be..6ffb0f7 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
@@ -14,14 +14,8 @@
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.activiti.bpmn.BpmnAutoLayout;
-import org.activiti.bpmn.model.BpmnModel;
-import org.activiti.bpmn.model.EndEvent;
-import org.activiti.bpmn.model.ExclusiveGateway;
-import org.activiti.bpmn.model.ParallelGateway;
import org.activiti.bpmn.model.Process;
-import org.activiti.bpmn.model.SequenceFlow;
-import org.activiti.bpmn.model.StartEvent;
-import org.activiti.bpmn.model.UserTask;
+import org.activiti.bpmn.model.*;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.ProcessEngines;
import org.activiti.engine.RuntimeService;
@@ -172,19 +166,19 @@
List<WorkflowStepStaffDto> userList = step.getWorkflowStepStaffs();
for (int u = 0; u < userList.size(); u++) {
//骞惰缃戝叧鍒嗘敮鐨勫鏍歌妭鐐�
- process.addFlowElement(createUserTask("userTask" + i + u, "userTask" + i + u, userList.get(u).getStaffId()));
+ process.addFlowElement(createUserTask("userTask" + i + u, userList.get(u).getStaffName(), userList.get(u).getStaffId()));
}
//骞惰缃戝叧-姹囪仛
process.addFlowElement(createParallelGateway("parallelGateway-join" + i, "parallelGateway-join" + i));
- process.addFlowElement(createUserTask("repulse" + i, "repulse" + i, "${startUserId}"));
+ process.addFlowElement(createUserTask("repulse" + i, "鎻愪氦鑰�", "${startUserId}"));
} else {
//鏅�氭祦杞�
//瀹℃牳鑺傜偣
- process.addFlowElement(createGroupTask("task" + i, "task" + i, step.getWorkflowStepStaffs().get(0).getStaffId()));
+ process.addFlowElement(createGroupTask("task" + i, step.getWorkflowStepStaffs().get(0).getStaffName(), step.getWorkflowStepStaffs().get(0).getStaffId()));
//鍥為��鑺傜偣
- process.addFlowElement(createUserTask("repulse" + i, "repulse" + i, "${startUserId}"));
+ process.addFlowElement(createUserTask("repulse" + i, "鎻愪氦鑰�", "${startUserId}"));
}
}
//缁撴潫鑺傜偣
@@ -206,7 +200,7 @@
if (WorkflowStepDto.TYPE_COUNTERSIGN.equals(workflowStepDtos.get(y - 1).getType())) {
process.addFlowElement(createSequenceFlow("parallelGateway-join" + (y - 1), "parallelGateway-fork" + y, "parallelGateway-join-parallelGateway-fork-鍒嗘敮" + y, ""));
} else {
- process.addFlowElement(createSequenceFlow("task" + (y - 1), "repulse" + y, "task-repulse" + y, ""));
+ process.addFlowElement(createSequenceFlow("task" + (y - 1), "parallelGateway-fork" + y, "task-repulse" + y, ""));
}
}
//骞惰缃戝叧-鍒嗘敮鍜屼細绛剧敤鎴疯繛绾匡紝浼氱鐢ㄦ埛鍜屽苟琛岀綉鍏�-姹囪仛杩炵嚎
@@ -220,9 +214,9 @@
}
}
//鏈�鍚庝竴涓妭鐐� 骞惰缃戝叧-姹囪仛鍒扮粨鏉熻妭鐐�
-// if (y == (userList.size() - 1)) {
-// process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "endEvent", "parallelGateway-join-endEvent", ""));
-// }
+ if (y == (workflowStepDtos.size() - 1)) {
+ process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "parallelGateway-join-endEvent", "${flag=='true'}"));
+ }
} else {
//鏅�氭祦杞�
//绗竴涓妭鐐�
@@ -243,10 +237,12 @@
//鏄惁鏈�鍚庝竴涓妭鐐�
if (y == (workflowStepDtos.size() - 1)) {
//瀹℃牳鑺傜偣鍒扮粨鏉熻妭鐐�
- process.addFlowElement(createSequenceFlow("task" + y, "endEvent", "task" + y + "endEvent", "${flag=='true'}"));
+ process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "task" + y + "endEvent", "${flag=='true'}"));
+ process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, ""));
+ } else {
+ //瀹℃牳鑺傜偣鍒板洖閫�鑺傜偣
+ process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
}
- //瀹℃牳鑺傜偣鍒板洖閫�鑺傜偣
- process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
process.addFlowElement(createSequenceFlow("repulse" + y, "task" + y, "repulse-task" + y, ""));
}
}
@@ -255,7 +251,8 @@
new BpmnAutoLayout(model).execute();
// 3. 閮ㄧ讲娴佺▼
- Deployment deployment = processEngine.getRepositoryService().createDeployment().addBpmnModel(process.getId() + ".bpmn", model).name(process.getId() + "_deployment").deploy();
+ Deployment deployment = processEngine.getRepositoryService().createDeployment()
+ .addBpmnModel(process.getId() + ".bpmn", model).name(process.getId() + "_deployment").deploy();
workflowDto.setProcessDefinitionKey(deployment.getId());
// // 4. 鍚姩涓�涓祦绋嬪疄渚�
// ProcessInstance processInstance = processEngine.getRuntimeService().startProcessInstanceByKey(process.getId());
@@ -282,7 +279,7 @@
}
private int getNormal(List<WorkflowStepDto> workflowStepDtos, int y) {
- for (int stepIndex = y; stepIndex > 0; y--) {
+ for (int stepIndex = y; stepIndex > 0; stepIndex--) {
if (WorkflowStepDto.TYPE_NORMAL.equals(workflowStepDtos.get(stepIndex).getType())) {
return stepIndex;
}
--
Gitblit v1.8.0