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

update - 调整推送接口返回模型属性异常的问题

Browse Source
This commit is contained in:
wangli 2024-03-26 09:43:10 +08:00
parent d67cbff1d2
commit 7f3b61aad2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -102,8 +102,6 @@ import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AND;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.EXCEPTIONAL;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.GENERAL;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.OR;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_BUSINESS;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_CARBON_COPY;
import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_STARTER;
import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.PROCESSING;
import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_ID_NOT_EXISTS;
@ -712,7 +710,8 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
instances.forEach(i -> procDefIds.add(i.getProcessDefinitionId()));
Map<String, String> defCategoryMap =
repositoryService.createProcessDefinitionQuery().processDefinitionIds(procDefIds).list()
.stream().collect(Collectors.toMap(ProcessDefinition::getId, ProcessDefinition::getCategory, (s, t) -> s));
.stream().collect(Collectors.toMap(ProcessDefinition::getId,
ProcessDefinition::getCategory, (s, t) -> s));
List<HistoricProcessInstanceVO> vos = new ArrayList<>();
instances.forEach(i -> vos.add(historicProcessInstanceConverter.toVo(i,
defCategoryMap.getOrDefault(i.getProcessDefinitionId(), ""))));
@ -750,8 +749,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
node.setNodeType(NODE_STARTER);
}
node.setNodeMode(GENERAL);
node.setId(i.getId())
.setName(i.getName());
node.setId(i.getId()).setName(i.getName());
if (i instanceof UserTask) {
UserTask userTask = (UserTask) i;
node.setFormKey(userTask.getFormKey());
@ -789,7 +787,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
});
}
}
} else if (i instanceof ServiceTask){
} else if (i instanceof ServiceTask) {
// ServiceTask 主要作用于抄送
ServiceTask serviceTask = (ServiceTask) i;
node.setId(serviceTask.getId()).setName(serviceTask.getName());