diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java
index c8dcaa81a..bea3d2f71 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java
@@ -534,7 +534,7 @@ public final class BpmnJsonConverterUtil {
// String fileName = "/Users/wangli/work/company/yizhi/workflow-engine/workflow-engine-server/src/main" +
// "/resources/权限点模型.json";
String fileName = "/Users/wangli/work/company/yizhi/workflow-engine/workflow-engine-server/src/main" +
- "/resources/kaoqing.json";
+ "/resources/ruchang.json";
byte[] bytes = Files.readAllBytes(Paths.get(fileName));
String content = new String(bytes, StandardCharsets.UTF_8);
diff --git a/workflow-engine-server/src/main/resources/ruchang.bpmn20.xml b/workflow-engine-server/src/main/resources/ruchang.bpmn20.xml
new file mode 100644
index 000000000..6809a3042
--- /dev/null
+++ b/workflow-engine-server/src/main/resources/ruchang.bpmn20.xml
@@ -0,0 +1,264 @@
+
+
+
+ remark
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${nrOfInstances == nrOfCompletedInstances}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${nrOfInstances == nrOfCompletedInstances}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${nrOfInstances == nrOfCompletedInstances}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/workflow-engine-server/src/main/resources/ruchang.json b/workflow-engine-server/src/main/resources/ruchang.json
new file mode 100644
index 000000000..b158e2743
--- /dev/null
+++ b/workflow-engine-server/src/main/resources/ruchang.json
@@ -0,0 +1,424 @@
+{
+ "name": "考勤补卡",
+ "description": "极引非东活已运王点越组油门展总想立。年深江亲联热制者条济它部即月。号线信平和者京两马何标这。",
+ "category": "1",
+ "jsonModel": {
+ "noticeConf": {
+ "pendingMessageId": "6b2fd313a7e04fcb8d92ca6fa4c675e9",
+ "noticeMessageId": "590",
+ "smsId": "40"
+ },
+ "buttonConf": {
+ "initiator": [
+ {
+ "order": 1,
+ "btnKey": "BPMN_APPROVE",
+ "checked": true,
+ "disabled": false,
+ "btnName": "同意"
+ },
+ {
+ "order": 2,
+ "btnKey": "BPMN_REJECT",
+ "btnName": "拒绝",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 3,
+ "btnKey": "BPMN_REVOCATION",
+ "btnName": "撤回",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 4,
+ "btnKey": "BPMN_TRANSFER",
+ "btnName": "转交",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 5,
+ "btnKey": "BPMN_COUNTERSIGN",
+ "btnName": "加签",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 6,
+ "btnKey": "BPMN_COMMENT",
+ "btnName": "评论",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 7,
+ "btnKey": "BPMN_ROLLBACK",
+ "btnName": "回退",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 8,
+ "btnKey": "BPMN_COPY",
+ "btnName": "抄送",
+ "checked": true,
+ "disabled": false
+ }
+ ],
+ "carbonCopy": [
+ {
+ "order": 1,
+ "btnKey": "BPMN_APPROVE",
+ "checked": true,
+ "disabled": false,
+ "btnName": "同意"
+ },
+ {
+ "order": 2,
+ "btnKey": "BPMN_REJECT",
+ "btnName": "拒绝",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 3,
+ "btnKey": "BPMN_REVOCATION",
+ "btnName": "撤回",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 4,
+ "btnKey": "BPMN_TRANSFER",
+ "btnName": "转交",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 5,
+ "btnKey": "BPMN_COUNTERSIGN",
+ "btnName": "加签",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 6,
+ "btnKey": "BPMN_COMMENT",
+ "btnName": "评论",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 7,
+ "btnKey": "BPMN_ROLLBACK",
+ "btnName": "回退",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 8,
+ "btnKey": "BPMN_COPY",
+ "btnName": "抄送",
+ "checked": true,
+ "disabled": false
+ }
+ ],
+ "history": [
+ {
+ "order": 1,
+ "btnKey": "BPMN_APPROVE",
+ "checked": true,
+ "disabled": false,
+ "btnName": "同意"
+ },
+ {
+ "order": 2,
+ "btnKey": "BPMN_REJECT",
+ "btnName": "拒绝",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 3,
+ "btnKey": "BPMN_REVOCATION",
+ "btnName": "撤回",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 4,
+ "btnKey": "BPMN_TRANSFER",
+ "btnName": "转交",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 5,
+ "btnKey": "BPMN_COUNTERSIGN",
+ "btnName": "加签",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 6,
+ "btnKey": "BPMN_COMMENT",
+ "btnName": "评论",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 7,
+ "btnKey": "BPMN_ROLLBACK",
+ "btnName": "回退",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 8,
+ "btnKey": "BPMN_COPY",
+ "btnName": "抄送",
+ "checked": true,
+ "disabled": false
+ }
+ ],
+ "current": [
+ {
+ "order": 1,
+ "btnKey": "BPMN_APPROVE",
+ "checked": true,
+ "disabled": false,
+ "btnName": "同意"
+ },
+ {
+ "order": 2,
+ "btnKey": "BPMN_REJECT",
+ "btnName": "拒绝",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 3,
+ "btnKey": "BPMN_REVOCATION",
+ "btnName": "撤回",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 4,
+ "btnKey": "BPMN_TRANSFER",
+ "btnName": "转交",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 5,
+ "btnKey": "BPMN_COUNTERSIGN",
+ "btnName": "加签",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 6,
+ "btnKey": "BPMN_COMMENT",
+ "btnName": "评论",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 7,
+ "btnKey": "BPMN_ROLLBACK",
+ "btnName": "回退",
+ "checked": true,
+ "disabled": false
+ },
+ {
+ "order": 8,
+ "btnKey": "BPMN_COPY",
+ "btnName": "抄送",
+ "checked": true,
+ "disabled": false
+ }
+ ]
+ },
+ "fieldConf": [
+ {
+ "name": "价格",
+ "code": "price",
+ "type": "number"
+ },
+ {
+ "name": "标题",
+ "code": "title",
+ "type": "string"
+ },
+ {
+ "name": "性别",
+ "code": "age",
+ "type": "radio",
+ "options": [
+ {
+ "name": "男",
+ "value": "1"
+ },
+ {
+ "name": "女",
+ "value": "2"
+ }
+ ]
+ },
+ {
+ "name": "颜色",
+ "code": "color",
+ "type": "checkbox",
+ "options": [
+ {
+ "name": "红色",
+ "value": "read"
+ },
+ {
+ "name": "蓝色",
+ "value": "blue"
+ },
+ {
+ "name": "绿色",
+ "value": "green"
+ }
+ ]
+ }
+ ],
+ "node": {
+ "id": "1",
+ "parentId": "0",
+ "type": "NODE_STARTER",
+ "name": "发起人",
+ "children": {
+ "id": "2",
+ "parentId": "1",
+ "type": "NODE_EXCLUSIVE_GATEWAY",
+ "name": "排它网关",
+ "children": {
+ "id": "3",
+ "parentId": "2",
+ "type": "NODE_EXCLUSIVE_GATEWAY",
+ "name": "排它网关",
+ "children": {
+ "id": "9",
+ "parentId": "3",
+ "type": "NODE_TASK",
+ "name": "总包处理",
+ "property": {
+ "approvalMethod": "human",
+ "approverScope": "projectWorkspace",
+ "approverSpecify": "fixedPerson",
+ "specifyValue": [
+ "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}"
+ ],
+ "multiMode": "AND",
+ "approverEmptyHandleType": "autoPassed"
+ }
+ },
+ "branches": [
+ {
+ "id": "7",
+ "parentId": "3",
+ "type": "NODE_CONDITION",
+ "name": "需要分包审核",
+ "children": {
+ "id": "10",
+ "parentId": "7",
+ "type": "NODE_TASK",
+ "name": "分包处理",
+ "property": {
+ "approvalMethod": "human",
+ "approverScope": "projectWorkspace",
+ "approverSpecify": "fixedPerson",
+ "specifyValue": [
+ "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}"
+ ],
+ "multiMode": "AND",
+ "approverEmptyHandleType": "autoPassed"
+ }
+ },
+ "property": {
+ "groups": [
+ {
+ "conditionsType": "or",
+ "conditions": [
+ {
+ "fieldDataType": "number",
+ "fieldCode": "type2",
+ "operator": "eq"
+ }
+ ]
+ }
+ ],
+ "defaultBranch": false,
+ "groupsType": "or"
+ }
+ },
+ {
+ "id": "8",
+ "parentId": "3",
+ "type": "NODE_CONDITION",
+ "name": "不需要分包审核",
+ "property": {
+ "defaultBranch": true
+ }
+ }
+ ]
+ },
+ "branches": [
+ {
+ "id": "4",
+ "parentId": "1",
+ "type": "NODE_CONDITION",
+ "name": "工人发起",
+ "property": {
+ "groups": [
+ {
+ "conditionsType": "or",
+ "conditions": [
+ {
+ "fieldDataType": "number",
+ "fieldCode": "type",
+ "operator": "eq"
+ }
+ ]
+ }
+ ],
+ "defaultBranch": false,
+ "groupsType": "or"
+ },
+ "children": {
+ "id": "6",
+ "parentId": "4",
+ "type": "NODE_TASK",
+ "name": "班组处理",
+ "property": {
+ "approvalMethod": "human",
+ "approverScope": "projectWorkspace",
+ "approverSpecify": "fixedPerson",
+ "specifyValue": [
+ "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}"
+ ],
+ "multiMode": "AND",
+ "approverEmptyHandleType": "autoPassed"
+ }
+ }
+ },
+ {
+ "id": "5",
+ "parentId": "1",
+ "type": "NODE_CONDITION",
+ "name": "班组发起",
+ "property": {
+ "defaultBranch": true
+ }
+ }
+ ]
+ }
+ }
+ }
+}
diff --git a/workflow-engine-server/src/main/resources/test-all.json b/workflow-engine-server/src/main/resources/test-all.json
deleted file mode 100644
index e00e88eb2..000000000
--- a/workflow-engine-server/src/main/resources/test-all.json
+++ /dev/null
@@ -1,958 +0,0 @@
-{
- "key": "new_model",
- "name": "新模型",
- "noticeConf": {
- "pendingMessageId": "41",
- "noticeMessageId": "64",
- "smsId": "40"
- },
- "description": "极引非东活已运王点越组油门展总想立。年深江亲联热制者条济它部即月。号线信平和者京两马何标这。",
- "fieldConf": [
- {
- "name": "价格",
- "code": "price",
- "type": "number"
- },
- {
- "name": "标题",
- "code": "title",
- "type": "string"
- },
- {
- "name": "性别",
- "code": "age",
- "type": "radio",
- "options": [
- {
- "name": "男",
- "value": "1"
- },
- {
- "name": "女",
- "value": "2"
- }
- ]
- },
- {
- "name": "颜色",
- "code": "color",
- "type": "checkbox",
- "options": [
- {
- "name": "红色",
- "value": "read"
- },
- {
- "name": "蓝色",
- "value": "blue"
- },
- {
- "name": "绿色",
- "value": "green"
- }
- ]
- }
- ],
- "category": "customCategory",
- "buttonConf": {
- "initiator": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "carbonCopy": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "history": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "current": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ]
- },
- "node": {
- "id": "1",
- "parentId": "0",
- "type": "NODE_STARTER",
- "name": "发起人",
- "children": {
- "id": "2",
- "parentId": "1",
- "type": "NODE_TASK",
- "name": "一级审批",
- "children": {
- "id": "3",
- "parentId": "2",
- "type": "NODE_EXCLUSIVE_GATEWAY",
- "name": "排它网关",
- "children": {
- "id": "11",
- "parentId": "3",
- "type": "NODE_CARBON_COPY",
- "name": "主流程抄送节点",
- "children": {
- "id": "12",
- "parentId": "11",
- "type": "NODE_EMPTY",
- "name": "结束",
- "children": null,
- "property": {},
- "branches": null
- },
- "property": null,
- "branches": null
- },
- "branches": [
- {
- "id": "4",
- "parentId": "3",
- "type": "NODE_CONDITION",
- "name": "条件1",
- "property": {
- "groups": [
- {
- "conditionsType": "and",
- "conditions": [
- {
- "fieldDataType": "string",
- "fieldCode": "title",
- "operator": "contains",
- "defaultValue": "测试"
- },
- {
- "fieldDataType": "number",
- "fieldCode": "price",
- "operator": "eq",
- "defaultValue": "2"
- }
- ]
- }
- ],
- "defaultBranch": false,
- "groupsType": "and"
- },
- "children": {
- "id": "7",
- "parentId": "4",
- "type": "NODE_TASK",
- "name": "条件1审核节点",
- "children": {
- "id": "8",
- "parentId": "7",
- "type": "NODE_CARBON_COPY",
- "name": "条件1抄送节点",
- "children": null,
- "property": null,
- "branches": null
- },
- "property": {
- "approvalMethod": "autoPassed",
- "approverScope": "entWorkspace",
- "approverSpecify": "position",
- "specifyValue": [
- "job1",
- "job2"
- ],
- "isMultiTask": "true",
- "multiMode": "AND",
- "approverEmptyHandleType": "autoPassed",
- "fieldPermission": null,
- "buttonPermission": {
- "initiator": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "carbonCopy": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "history": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "current": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ]
- }
- },
- "branches": null
- },
- "branches": null
- },
- {
- "id": "5",
- "parentId": "3",
- "type": "NODE_CONDITION",
- "name": "条件2",
- "property": {
- "groups": [
- {
- "conditionsType": "and",
- "conditions": [
- {
- "fieldDataType": "number",
- "fieldCode": "size",
- "operator": "between",
- "leftValue": "31",
- "leftOperator": "le",
- "rightValue": "34",
- "rightOperator": "gt"
- },
- {
- "fieldDataType": "radio",
- "fieldCode": "sex",
- "operator": "eq",
- "defaultValue": "2"
- },
- {
- "fieldDataType": "checkbox",
- "fieldCode": "color",
- "operator": "in",
- "defaultValues": [
- "red",
- "blue"
- ]
- }
- ]
- }
- ],
- "defaultBranch": false,
- "groupsType": "and"
- },
- "children": {
- "id": "9",
- "parentId": "5",
- "type": "NODE_BUSINESS",
- "name": "条件2业务节点",
- "children": {
- "id": "10",
- "parentId": "9",
- "type": "NODE_TASK",
- "name": "条件2审批节点",
- "children": {
- "id": "13",
- "parentId": "10",
- "type": "NODE_BUSINESS",
- "name": "业务节点有审批人",
- "property": {
- "approvalMethod": "human",
- "approverScope": "projectWorkspace",
- "approverSpecify": "identity",
- "specifyValue": [
- "worker",
- "team_worker"
- ],
- "isMultiTask": "true",
- "multiMode": "AND",
- "approverEmptyHandleType": "transferToAdmin",
- "fieldPermission": null,
- "buttonPermission": null
- },
- "children": null,
- "branches": null
- },
- "property": {
- "approvalMethod": "human",
- "approverScope": "projectWorkspace",
- "approverSpecify": "position",
- "specifyValue": [
- "job1",
- "job2"
- ],
- "isMultiTask": "true",
- "multiMode": "AND",
- "approverEmptyHandleType": "autoPassed",
- "fieldPermission": null,
- "buttonPermission": null
- },
- "branches": null
- },
- "property": {
- "approvalMethod": "nobody"
- },
- "branches": null
- },
- "branches": null
- },
- {
- "id": "6",
- "parentId": "3",
- "type": "NODE_CONDITION",
- "name": "默认条件",
- "property": {
- "defaultBranch": true
- },
- "children": null,
- "branches": null
- }
- ],
- "property": null
- },
- "branches": null,
- "property": {
- "approvalMethod": "human",
- "approverScope": "projectWorkspace",
- "approverSpecify": "position",
- "specifyValue": [
- "job1",
- "job2"
- ],
- "isMultiTask": "true",
- "multiMode": "AND",
- "approverEmptyHandleType": "transferToAdmin",
- "fieldPermission": null,
- "buttonPermission": {
- "initiator": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "carbonCopy": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "history": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "current": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ]
- }
- }
- },
- "branches": null,
- "property": {
- "buttonPermission": {
- "initiator": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "carbonCopy": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "history": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ],
- "current": [
- {
- "btnKey": "BPMN_APPROVE",
- "enabled": true,
- "btnName": "同意"
- },
- {
- "btnKey": "BPMN_REJECT",
- "btnName": "拒绝",
- "enabled": true
- },
- {
- "btnKey": "BPMN_REVOCATION",
- "btnName": "撤回",
- "enabled": true
- },
- {
- "btnKey": "BPMN_FORWARD",
- "btnName": "转交",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COUNTERSIGN",
- "btnName": "加签",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COMMENT",
- "btnName": "评论",
- "enabled": true
- },
- {
- "btnKey": "BPMN_ROLLBACK",
- "btnName": "回退",
- "enabled": true
- },
- {
- "btnKey": "BPMN_COPY",
- "btnName": "抄送",
- "enabled": true
- }
- ]
- }
- }
- },
- "tenantId": "296"
-}
diff --git a/workflow-engine-server/src/main/resources/test.bpmn20.xml b/workflow-engine-server/src/main/resources/test.bpmn20.xml
index 0fbb54077..779425555 100644
--- a/workflow-engine-server/src/main/resources/test.bpmn20.xml
+++ b/workflow-engine-server/src/main/resources/test.bpmn20.xml
@@ -79,9 +79,10 @@
-
-
+
@@ -144,14 +145,15 @@
${nrOfInstances == nrOfCompletedInstances}
-
+
-
-
+ default="SequenceFlowId_ebd1b92df5e84fa5bb6814221f0136ad">
+
+
-
+
@@ -221,8 +223,8 @@
-
-
+
+
@@ -233,7 +235,8 @@
-
+
@@ -255,7 +258,7 @@
${nrOfInstances == nrOfCompletedInstances}
-
+
${nrOfInstances == nrOfCompletedInstances}
-
-
+
+
@@ -288,120 +291,122 @@
-
-
+
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+