From 7adc60231aa6e02cb6000481c67e50644b76a883 Mon Sep 17 00:00:00 2001 From: wangli Date: Wed, 6 Dec 2023 00:22:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E4=B8=BA=E4=BA=86=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E5=89=8D=E7=AB=AF=E7=9A=84=E6=A0=BC=E5=BC=8F,?= =?UTF-8?q?=E8=A2=AB=E8=BF=AB=E4=BF=AE=E6=94=B9=E8=BD=AC=E6=8D=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/utils/BpmnJsonConverterUtil.java | 12 +- .../src/main/resources/temp.bpmn20.xml | 411 ++++++---- .../src/main/resources/temp2.json | 711 +++++++++++++++++- 3 files changed, 964 insertions(+), 170 deletions(-) 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 31ee68535..3ee4d1c74 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 @@ -448,13 +448,16 @@ public final class BpmnJsonConverterUtil { (Objects.isNull(branch.getChildren()) || Objects.isNull(branch.getChildren().getType()) || Objects.equals(NODE_EMPTY, branch.getChildren().getType())) ? bpmnJsonNode.getChildren() : branch.getChildren(); - if (Objects.isNull(nextJsonNode) || Objects.isNull(nextJsonNode.getId()) || Objects.equals(NODE_EMPTY - , nextJsonNode.getType())) { + if (Objects.isNull(nextJsonNode) || Objects.isNull(nextJsonNode.getId()) || + (Objects.equals(NODE_EMPTY, nextJsonNode.getType()) && Objects.isNull(nextJsonNode.getChildren()))) { BpmnJsonNode tempEndNode = new BpmnJsonNode(); tempEndNode.setIncoming(Lists.newArrayList(gateway.getId())); tempEndNode.setId(END_EVENT_ID); nextJsonNode = tempEndNode; } else { + if (Objects.equals(NODE_EMPTY, nextJsonNode.getType()) && Objects.nonNull(nextJsonNode.getChildren())) { + nextJsonNode = nextJsonNode.getChildren(); + } nextJsonNode.setIncoming(Lists.newArrayList(gateway.getId())); // 将 node_condition 放入计算节点的上级属性中，方便顺序流转换器对条件进行处理 @@ -481,13 +484,16 @@ public final class BpmnJsonConverterUtil { // 开始处理下级节点 BpmnJsonNode children = bpmnJsonNode.getChildren(); - if (Objects.isNull(children) || Objects.equals(NODE_EMPTY, children.getType()) || !StringUtils.hasLength(children.getId())) { + if (Objects.isNull(children) || (Objects.equals(NODE_EMPTY, children.getType()) && (Objects.isNull(children.getChildren()) || Objects.isNull(children.getChildren().getId()))) || !StringUtils.hasLength(children.getId())) { if (CollectionUtils.isEmpty(branchLastNodeIds)) { return Lists.newArrayList(flowElement.getId()); } else { return branchLastNodeIds; } } else { + if (Objects.equals(NODE_EMPTY, children.getType()) && Objects.nonNull(children.getChildren()) && Objects.nonNull(children.getChildren().getId())) { + children = children.getChildren(); + } if (CollectionUtils.isEmpty(branchLastNodeIds)) { return create(children, mainProcess, bpmnModel, flowElement.getId()); } diff --git a/workflow-engine-server/src/main/resources/temp.bpmn20.xml b/workflow-engine-server/src/main/resources/temp.bpmn20.xml index 76252e917..ac4fa2da3 100644 --- a/workflow-engine-server/src/main/resources/temp.bpmn20.xml +++ b/workflow-engine-server/src/main/resources/temp.bpmn20.xml @@ -4,16 +4,16 @@ xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" - targetNamespace="1"> - - 考勤补卡 + targetNamespace="http://www.flowable.org/test"> + + remark - - + + @@ -59,10 +59,10 @@ - + - + @@ -77,25 +77,23 @@ - - - - - - + + + + - - - - + + + - - - + + @@ -153,26 +151,17 @@ - + - ${nrOfCompletedInstances > 0} + ${nrOfInstances == nrOfCompletedInstances} - - - - - - - - + - - - - + + + + @@ -230,112 +219,282 @@ - + - ${nrOfCompletedInstances > 0} + ${nrOfInstances == nrOfCompletedInstances} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${nrOfInstances == nrOfCompletedInstances} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${nrOfInstances == nrOfCompletedInstances} + + + + + + - - - - - - + + + + - - + + - - + + - - - - - - - + - - + + + + + + + + + + + + + + - + - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + diff --git a/workflow-engine-server/src/main/resources/temp2.json b/workflow-engine-server/src/main/resources/temp2.json index 82eda53d9..ab54a5f67 100644 --- a/workflow-engine-server/src/main/resources/temp2.json +++ b/workflow-engine-server/src/main/resources/temp2.json @@ -1,7 +1,7 @@ { - "name": "考勤补卡", - "category": 1, - "remark": "考勤补卡", + "name": "aaaaaaa", + "category": 16, + "remark": "aaaaaa", "workspaceId": null, "jsonModel": { "node": { @@ -10,13 +10,13 @@ "type": "NODE_STARTER", "name": "发起人", "children": { - "id": "node_477189959824", + "id": "node_747506773306", "parentId": "NODE_STARTER", "type": "NODE_EXCLUSIVE_GATEWAY", "name": "条件分支", "children": { - "id": "node_477189952742", - "parentId": "node_477189959824", + "id": "node_747506772941", + "parentId": "node_747506773306", "type": "NODE_EMPTY", "name": null, "children": { @@ -33,23 +33,23 @@ }, "branches": [ { - "id": "node_477189959669", - "parentId": "node_477189959824", + "id": "node_747506779839", + "parentId": "node_747506773306", "type": "NODE_CONDITION", "name": "条件1", "children": { - "id": "node_477505273489", - "parentId": "node_477189959669", + "id": "node_747526784488", + "parentId": "node_747506779839", "type": "NODE_EXCLUSIVE_GATEWAY", "name": "条件分支", "children": { - "id": "node_477505288804", - "parentId": "node_477505273489", + "id": "node_747526782865", + "parentId": "node_747526784488", "type": "NODE_EMPTY", "name": null, "children": { - "id": "node_477715785687", - "parentId": "node_477505288804", + "id": "node_747585778431", + "parentId": "node_747526782865", "type": "NODE_TASK", "name": "审批节点", "children": { @@ -64,14 +64,13 @@ "branches": null, "property": { "approvalMethod": "human", - "approverScope": "projectWorkspace", - "approverSpecify": "identity", - "specifyValue": [ - "[{\"name\":\"代班长\",\"value\":\"AGENT_LEADER\"},{\"name\":\"项目部管理员\",\"value\":\"BU_ADMIN\"},{\"name\":\"参建单位负责人\",\"value\":\"ORG_ADMIN\"},{\"name\":\"班组长\",\"value\":\"TEAM_LEADER\"}]" - ], + "approverScope": "entWorkspace", + "approverSpecify": "role", + "specifyValue": "[{\"name\":\"企业通用/书记\",\"value\":25388}]", "isMultiTask": true, "multiMode": "AND", "approverEmptyHandleType": "autoPassed", + "emptyApproverSpecify": null, "fieldPermission": null, "buttonPermission": { "initiator": [ @@ -318,13 +317,13 @@ }, "branches": [ { - "id": "node_477505281704", - "parentId": "node_477505273489", + "id": "node_747526781312", + "parentId": "node_747526784488", "type": "NODE_CONDITION", "name": "条件1", "children": { - "id": "node_477663454558", - "parentId": "node_477505281704", + "id": "node_747571121516", + "parentId": "node_747526781312", "type": "NODE_TASK", "name": "审批节点", "children": { @@ -341,12 +340,11 @@ "approvalMethod": "human", "approverScope": "projectWorkspace", "approverSpecify": "position", - "specifyValue": [ - "[{\"name\":\"施工单位/项目经理\",\"value\":\"coTheprojectmanager\"},{\"name\":\"施工单位/项目执行经理\",\"value\":\"coProjectimplementationmanager\"},{\"name\":\"施工单位/项目书记\",\"value\":\"coSecretaryoftheproject\"},{\"name\":\"施工单位/项目生产副经理\",\"value\":\"coProductionvicemanageroftheproject\"},{\"name\":\"施工单位/项目商务副经理\",\"value\":\"coTheprojectbusinessassistantmanager\"},{\"name\":\"施工单位/商务部主管\",\"value\":\"coTheMinistryofCommercemanager\"},{\"name\":\"施工单位/项目技术总工\",\"value\":\"coTechnicalprojectgeneral\"},{\"name\":\"施工单位/技术员\",\"value\":\"coThetechnician\"},{\"name\":\"施工单位/资料员\",\"value\":\"coresposible\"},{\"name\":\"施工单位/测量主管\",\"value\":\"coMeasuringhead\"},{\"name\":\"施工单位/质检员\",\"value\":\"coQualitativecheckmember\"},{\"name\":\"施工单位/安全员\",\"value\":\"cosafe\"},{\"name\":\"施工单位/安全部主管（部长、经理）\",\"value\":\"coHomelandsecuritymanager\"},{\"name\":\"施工单位/施工员\",\"value\":\"coThebuilder\"},{\"name\":\"施工单位/工程部部主管（部长、经理）\",\"value\":\"coEngineeringmanager\"},{\"name\":\"施工单位/计划管理员\",\"value\":\"coPlanadministrator\"}]" - ], + "specifyValue": "[{\"name\":\"施工单位/项目经理\",\"value\":\"coTheprojectmanager\"}]", "isMultiTask": true, "multiMode": "AND", "approverEmptyHandleType": "autoPassed", + "emptyApproverSpecify": null, "fieldPermission": null, "buttonPermission": { "initiator": [ @@ -597,6 +595,7 @@ "isMultiTask": true, "multiMode": null, "approverEmptyHandleType": null, + "emptyApproverSpecify": null, "fieldPermission": null, "buttonPermission": null, "defaultBranch": false, @@ -604,8 +603,9 @@ { "conditions": [ { + "name": "aaa", "type": "number", - "code": "subcontractAuditFlag", + "code": "a", "operator": "eq", "defaultValue": "1", "defaultValues": [], @@ -623,8 +623,8 @@ } }, { - "id": "node_477505288658", - "parentId": "node_477505273489", + "id": "node_747526782498", + "parentId": "node_747526784488", "type": "NODE_CONDITION", "name": "默认分支", "children": null, @@ -637,6 +637,7 @@ "isMultiTask": true, "multiMode": null, "approverEmptyHandleType": null, + "emptyApproverSpecify": null, "fieldPermission": null, "buttonPermission": null, "defaultBranch": true, @@ -659,6 +660,7 @@ "isMultiTask": true, "multiMode": null, "approverEmptyHandleType": null, + "emptyApproverSpecify": null, "fieldPermission": null, "buttonPermission": null, "defaultBranch": null, @@ -676,6 +678,7 @@ "isMultiTask": true, "multiMode": null, "approverEmptyHandleType": null, + "emptyApproverSpecify": null, "fieldPermission": null, "buttonPermission": null, "defaultBranch": false, @@ -683,10 +686,11 @@ { "conditions": [ { + "name": "aaa", "type": "number", - "code": "applyType", + "code": "a", "operator": "eq", - "defaultValue": "2", + "defaultValue": "1", "defaultValues": [], "leftOperator": null, "rightOperator": null, @@ -702,11 +706,634 @@ } }, { - "id": "node_477189958725", - "parentId": "node_477189959824", + "id": "node_747506777383", + "parentId": "node_747506773306", "type": "NODE_CONDITION", "name": "默认分支", - "children": null, + "children": { + "id": "node_747545605505", + "parentId": "node_747506777383", + "type": "NODE_EXCLUSIVE_GATEWAY", + "name": "条件分支", + "children": { + "id": "node_747545607334", + "parentId": "node_747545605505", + "type": "NODE_EMPTY", + "name": null, + "children": { + "id": "node_747618945956", + "parentId": "node_747545607334", + "type": "NODE_TASK", + "name": "审批节点", + "children": null, + "branches": null, + "property": { + "approvalMethod": "human", + "approverScope": "entWorkspace", + "approverSpecify": "role", + "specifyValue": "[{\"name\":\"企业通用/书记\",\"value\":25388}]", + "isMultiTask": true, + "multiMode": "AND", + "approverEmptyHandleType": "autoPassed", + "emptyApproverSpecify": null, + "fieldPermission": null, + "buttonPermission": { + "initiator": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": false, + "disabled": true + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "拒绝", + "checked": false, + "disabled": true + }, + { + "order": 3, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": true, + "disabled": false + }, + { + "order": 4, + "btnKey": "BPMN_TRANSFER", + "btnName": "转办", + "checked": false, + "disabled": true + }, + { + "order": 5, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": false, + "disabled": true + }, + { + "order": 6, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false + }, + { + "order": 7, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": true + }, + { + "order": 8, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": false, + "disabled": true + } + ], + "current": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": true, + "disabled": false + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "拒绝", + "checked": true, + "disabled": false + }, + { + "order": 3, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": false, + "disabled": true + }, + { + "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", + "btnName": "同意", + "checked": false, + "disabled": true + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "拒绝", + "checked": false, + "disabled": true + }, + { + "order": 3, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": false, + "disabled": true + }, + { + "order": 4, + "btnKey": "BPMN_TRANSFER", + "btnName": "转办", + "checked": false, + "disabled": true + }, + { + "order": 5, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": false, + "disabled": true + }, + { + "order": 6, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false + }, + { + "order": 7, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": true + }, + { + "order": 8, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": false, + "disabled": true + } + ], + "carbonCopy": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": false, + "disabled": true + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "拒绝", + "checked": false, + "disabled": true + }, + { + "order": 3, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": false, + "disabled": true + }, + { + "order": 4, + "btnKey": "BPMN_TRANSFER", + "btnName": "转办", + "checked": false, + "disabled": true + }, + { + "order": 5, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": false, + "disabled": true + }, + { + "order": 6, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false + }, + { + "order": 7, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": true + }, + { + "order": 8, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": false, + "disabled": true + } + ] + }, + "defaultBranch": null, + "groups": null, + "groupsType": "or", + "formKey": null + } + }, + "branches": null, + "property": null + }, + "branches": [ + { + "id": "node_747545608903", + "parentId": "node_747545605505", + "type": "NODE_CONDITION", + "name": "条件1", + "children": { + "id": "node_747602616511", + "parentId": "node_747545608903", + "type": "NODE_TASK", + "name": "审批节点", + "children": { + "id": null, + "parentId": null, + "type": null, + "name": null, + "children": null, + "branches": null, + "property": null + }, + "branches": null, + "property": { + "approvalMethod": "human", + "approverScope": "projectWorkspace", + "approverSpecify": "position", + "specifyValue": "[{\"name\":\"施工单位/项目经理\",\"value\":\"coTheprojectmanager\"},{\"name\":\"施工单位/项目执行经理\",\"value\":\"coProjectimplementationmanager\"}]", + "isMultiTask": true, + "multiMode": "AND", + "approverEmptyHandleType": "autoPassed", + "emptyApproverSpecify": null, + "fieldPermission": null, + "buttonPermission": { + "initiator": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": false, + "disabled": true + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "拒绝", + "checked": false, + "disabled": true + }, + { + "order": 3, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": true, + "disabled": false + }, + { + "order": 4, + "btnKey": "BPMN_TRANSFER", + "btnName": "转办", + "checked": false, + "disabled": true + }, + { + "order": 5, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": false, + "disabled": true + }, + { + "order": 6, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false + }, + { + "order": 7, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": true + }, + { + "order": 8, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": false, + "disabled": true + } + ], + "current": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": true, + "disabled": false + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "拒绝", + "checked": true, + "disabled": false + }, + { + "order": 3, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": false, + "disabled": true + }, + { + "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", + "btnName": "同意", + "checked": false, + "disabled": true + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "拒绝", + "checked": false, + "disabled": true + }, + { + "order": 3, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": false, + "disabled": true + }, + { + "order": 4, + "btnKey": "BPMN_TRANSFER", + "btnName": "转办", + "checked": false, + "disabled": true + }, + { + "order": 5, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": false, + "disabled": true + }, + { + "order": 6, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false + }, + { + "order": 7, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": true + }, + { + "order": 8, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": false, + "disabled": true + } + ], + "carbonCopy": [ + { + "order": 1, + "btnKey": "BPMN_APPROVE", + "btnName": "同意", + "checked": false, + "disabled": true + }, + { + "order": 2, + "btnKey": "BPMN_REJECT", + "btnName": "拒绝", + "checked": false, + "disabled": true + }, + { + "order": 3, + "btnKey": "BPMN_REVOCATION", + "btnName": "撤回", + "checked": false, + "disabled": true + }, + { + "order": 4, + "btnKey": "BPMN_TRANSFER", + "btnName": "转办", + "checked": false, + "disabled": true + }, + { + "order": 5, + "btnKey": "BPMN_COUNTERSIGN", + "btnName": "加签", + "checked": false, + "disabled": true + }, + { + "order": 6, + "btnKey": "BPMN_COMMENT", + "btnName": "评论", + "checked": true, + "disabled": false + }, + { + "order": 7, + "btnKey": "BPMN_ROLLBACK", + "btnName": "回退", + "checked": false, + "disabled": true + }, + { + "order": 8, + "btnKey": "BPMN_COPY", + "btnName": "抄送", + "checked": false, + "disabled": true + } + ] + }, + "defaultBranch": null, + "groups": null, + "groupsType": "or", + "formKey": null + } + }, + "branches": null, + "property": { + "approvalMethod": null, + "approverScope": null, + "approverSpecify": null, + "specifyValue": null, + "isMultiTask": true, + "multiMode": null, + "approverEmptyHandleType": null, + "emptyApproverSpecify": null, + "fieldPermission": null, + "buttonPermission": null, + "defaultBranch": false, + "groups": [ + { + "conditions": [ + { + "name": "aaa", + "type": "number", + "code": "a", + "operator": "gt", + "defaultValue": "1", + "defaultValues": [], + "leftOperator": null, + "rightOperator": null, + "leftValue": null, + "rightValue": null + } + ], + "conditionsType": "AND" + } + ], + "groupsType": "OR", + "formKey": null + } + }, + { + "id": "node_747545602702", + "parentId": "node_747545605505", + "type": "NODE_CONDITION", + "name": "默认分支", + "children": null, + "branches": null, + "property": { + "approvalMethod": null, + "approverScope": null, + "approverSpecify": null, + "specifyValue": null, + "isMultiTask": true, + "multiMode": null, + "approverEmptyHandleType": null, + "emptyApproverSpecify": null, + "fieldPermission": null, + "buttonPermission": null, + "defaultBranch": true, + "groups": [ + { + "conditions": [], + "conditionsType": "AND" + } + ], + "groupsType": "OR", + "formKey": null + } + } + ], + "property": { + "approvalMethod": null, + "approverScope": null, + "approverSpecify": null, + "specifyValue": null, + "isMultiTask": true, + "multiMode": null, + "approverEmptyHandleType": null, + "emptyApproverSpecify": null, + "fieldPermission": null, + "buttonPermission": null, + "defaultBranch": null, + "groups": null, + "groupsType": "or", + "formKey": null + } + }, "branches": null, "property": { "approvalMethod": null, @@ -716,6 +1343,7 @@ "isMultiTask": true, "multiMode": null, "approverEmptyHandleType": null, + "emptyApproverSpecify": null, "fieldPermission": null, "buttonPermission": null, "defaultBranch": true, @@ -738,6 +1366,7 @@ "isMultiTask": true, "multiMode": null, "approverEmptyHandleType": null, + "emptyApproverSpecify": null, "fieldPermission": null, "buttonPermission": null, "defaultBranch": null, @@ -755,8 +1384,8 @@ "viewJson": "{\"env\":\"[test]\",\"relationId\":590,\"contactUser\":null,\"moduleId\":24,\"moduleName\":\"项目公告\",\"receiveIdentityType\":3,\"bizType\":1,\"title\":\"补卡申请已完成审核\",\"content\":\"您提交的${workspaceName}${initiatorUserName}工人的考勤补卡申请已审核${processResult}，点击查看详情\",\"routers\":[],\"createAt\":1701694503000,\"updateAt\":1701694503000}" }, "pending": { - "pendingMessageId": "1faa3594b8314fd982daf337d9d9ffa6", - "viewJson": "{\"templateName\":\"考勤补卡申请待办\",\"templateCode\":\"1faa3594b8314fd982daf337d9d9ffa6\",\"category\":\"APPROVAL_PENDING_MESSAGE\",\"title\":\"工人考勤补卡审核\",\"content\":\"你有新的待审核工人考勤补卡申请，点击查看详情\",\"groupNodeNamePaths\":[\"APP管理端待办/入驻管理/进出场打卡\",\"APP工人端待办/考勤管理/出场打卡\"],\"status\":\"ENABLE\"}" + "pendingMessageId": "fcdff1e063514292b63f471ee9103b23", + "viewJson": "{\"templateName\":\"测试111\",\"templateCode\":\"fcdff1e063514292b63f471ee9103b23\",\"category\":\"APPROVAL_PENDING_MESSAGE\",\"title\":\"测试按钮\",\"content\":\"按钮\",\"groupNodeNamePaths\":[\"OMS待办中心/OMS待办中心/OMS待办中心\"],\"status\":\"ENABLE\"}" }, "sms": { "smsId": "", @@ -999,8 +1628,8 @@ }, "fieldConf": [ { - "code": "applyType", - "name": "项目/班组发起", + "code": "a", + "name": "aaa", "type": "number", "options": [ { @@ -1010,8 +1639,8 @@ ] }, { - "code": "subcontractAuditFlag", - "name": "是否需分包审核", + "code": "a", + "name": "a", "type": "number", "options": [ { @@ -1022,5 +1651,5 @@ } ] }, - "id": "202312042122000000000" + "id": "202312051914000000000" }