Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into frx

This commit is contained in:
furongxin 2024-09-28 15:10:54 +08:00
commit 5e2d73c60d

View File

@ -98,9 +98,9 @@ public interface BpmProcessInstanceConvert {
default BpmProcessInstanceRespVO convert2(HistoricProcessInstance processInstance, BpmProcessInstanceExtDO processInstanceExt, default BpmProcessInstanceRespVO convert2(HistoricProcessInstance processInstance, BpmProcessInstanceExtDO processInstanceExt,
ProcessDefinition processDefinition, BpmProcessDefinitionExtDO processDefinitionExt, ProcessDefinition processDefinition, BpmProcessDefinitionExtDO processDefinitionExt,
String bpmnXml, AdminUserRespDTO startUser, DeptRespDTO dept) { String bpmnXml, AdminUserRespDTO startUser, DeptRespDTO dept) {
BpmProcessInstanceRespVO respVO = new BpmProcessInstanceRespVO() ; BpmProcessInstanceRespVO respVO = convert2(processInstance);
copyTo(processInstanceExt, respVO); copyTo(processInstanceExt, respVO);
respVO = convert2(processInstance); respVO.setBusinessKey(processInstance.getBusinessKey()) ;
// definition // definition
respVO.setProcessDefinition(convert2(processDefinition)); respVO.setProcessDefinition(convert2(processDefinition));
copyTo(processDefinitionExt, respVO.getProcessDefinition()); copyTo(processDefinitionExt, respVO.getProcessDefinition());