wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add - 模拟创建考勤补卡的流程模型, 同时调整JSON 格式转换逻辑

Browse Source
This commit is contained in:
wangli 2023-11-30 17:19:06 +08:00
parent 8caa08ac1a
commit 17e3361d62
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessDefinitionServiceImpl.java
View File

@ -211,7 +211,8 @@ public class BpmnProcessDefinitionServiceImpl implements BpmnProcessDefinitionSe
} else if (filterDefinitions.size() == 1) { } else if (filterDefinitions.size() == 1) {
processDefinition = filterDefinitions.get(0); processDefinition = filterDefinitions.get(0);
} else { } else {
processDefinition = filterDefinitions.stream().filter(i -> Objects.equals(tenantId, i.getKey())).findFirst() processDefinition =
filterDefinitions.stream().filter(i -> Objects.equals(tenantId, i.getTenantId())).findFirst()
.orElseThrow(() -> new WorkflowEngineException(PROCESS_DEFINITION_ID_NOT_EXISTS)); .orElseThrow(() -> new WorkflowEngineException(PROCESS_DEFINITION_ID_NOT_EXISTS));
} }

20
workflow-engine-server/src/main/resources/kaoqing.json
View File

@ -4,8 +4,8 @@
"category": "1", "category": "1",
"jsonModel": { "jsonModel": {
"noticeConf": { "noticeConf": {
"pendingMessageId": "41", "pendingMessageId": "6b2fd313a7e04fcb8d92ca6fa4c675e9",
"noticeMessageId": "64", "noticeMessageId": "590",
"smsId": "40" "smsId": "40"
}, },
"buttonConf": { "buttonConf": {
@ -332,9 +332,9 @@
"property": { "property": {
"approvalMethod": "human", "approvalMethod": "human",
"approverScope": "projectWorkspace", "approverScope": "projectWorkspace",
"approverSpecify": "identity", "approverSpecify": "fixedPerson",
"specifyValue": [ "specifyValue": [
"{\"assignee\":\"\",\"assigneeType\":\"\"}" "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}"
], ],
"multiMode": "AND", "multiMode": "AND",
"approverEmptyHandleType": "autoPassed" "approverEmptyHandleType": "autoPassed"
@ -354,9 +354,9 @@
"property": { "property": {
"approvalMethod": "human", "approvalMethod": "human",
"approverScope": "projectWorkspace", "approverScope": "projectWorkspace",
"approverSpecify": "position", "approverSpecify": "fixedPerson",
"specifyValue": [ "specifyValue": [
"{\"assignee\":\"\",\"assigneeType\":\"\"}" "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}"
], ],
"multiMode": "AND", "multiMode": "AND",
"approverEmptyHandleType": "autoPassed" "approverEmptyHandleType": "autoPassed"
@ -424,9 +424,9 @@
"property": { "property": {
"approvalMethod": "human", "approvalMethod": "human",
"approverScope": "projectWorkspace", "approverScope": "projectWorkspace",
"approverSpecify": "position", "approverSpecify": "fixedPerson",
"specifyValue": [ "specifyValue": [
"{\"assignee\":\"\",\"assigneeType\":\"\"}" "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}"
], ],
"multiMode": "AND", "multiMode": "AND",
"approverEmptyHandleType": "autoPassed" "approverEmptyHandleType": "autoPassed"
@ -446,9 +446,9 @@
"property": { "property": {
"approvalMethod": "human", "approvalMethod": "human",
"approverScope": "projectWorkspace", "approverScope": "projectWorkspace",
"approverSpecify": "identity", "approverSpecify": "fixedPerson",
"specifyValue": [ "specifyValue": [
"{\"assignee\":\"\",\"assigneeType\":\"\"}" "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}"
], ],
"multiMode": "AND", "multiMode": "AND",
"approverEmptyHandleType": "autoPassed" "approverEmptyHandleType": "autoPassed"