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

Merge branch 'feature/REQ-1309' into dev

Browse Source
This commit is contained in:
wangli 2023-10-07 16:10:04 +08:00
commit 35543307ba
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/bpmn/process/BpmnProcessInstanceVO.java
View File

@ -38,6 +38,9 @@ public class BpmnProcessInstanceVO {
@ApiModelProperty(value = "流程定义 KEY")
private String processDefinitionKey;
@ApiModelProperty(value = "流程定义 ID")
private String processDefinitionId;
@ApiModelProperty(value = "业务的唯一标识", example = "1", notes = "例如说，请假申请的编号")
private String businessKey;

1
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnProcessInstanceConverter.java
View File

@ -42,6 +42,7 @@ public interface BpmnProcessInstanceConverter extends EntityConverter<BpmnProces
HistoricVariableInstance initiatorVariableInstance) {
BpmnProcessInstanceVO vo = toVo(processInstance);
vo.setCategory(processDefinition.getCategory());
vo.setProcessDefinitionId(processDefinition.getId());
vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
vo.setInitiator((BpmnTaskDelegateAssigner) initiatorVariableInstance.getValue());
return vo;