fix 对接统一平台生成办结 推送节点调整
This commit is contained in:
+17
-5
@@ -201,8 +201,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
|
||||
list.add(hiworkTodoAdd);
|
||||
pushWorkflowIntegrationAPI.sendTodoTask(list);
|
||||
|
||||
// 对接统一平台生成办结
|
||||
pushWorkflowIntegrationAPI.sendActivityComplete(list);
|
||||
//更新转办任务id
|
||||
LambdaUpdateWrapper<ProcessApprovalRecord> update = new LambdaUpdateWrapper<>();
|
||||
update.eq(ProcessApprovalRecord::getTaskId,taskId);
|
||||
@@ -298,9 +296,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
|
||||
hiworkTodoAdd.setProcessDefinitionId(processDefinitionId);
|
||||
list.add(hiworkTodoAdd);
|
||||
pushWorkflowIntegrationAPI.sendTodoTask(list);
|
||||
|
||||
// 对接统一平台生成办结
|
||||
pushWorkflowIntegrationAPI.sendActivityComplete(list);
|
||||
}
|
||||
|
||||
private void entityDeleted(ActivitiEvent event) {
|
||||
@@ -356,6 +351,7 @@ public class MyGlobalEventListener implements ActivitiEventListener {
|
||||
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
|
||||
|
||||
String processInstanceId = execution.getProcessInstanceId();
|
||||
String processDefinitionId = execution.getProcessDefinitionId();
|
||||
ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
|
||||
Date createTime = processAll.getCreateTime();
|
||||
DateTime date = DateUtil.date();
|
||||
@@ -373,6 +369,22 @@ public class MyGlobalEventListener implements ActivitiEventListener {
|
||||
log.info("taskEntity.getActivityName() = " + execution.getActivityName());
|
||||
log.info("taskEntity.getDeploymentId() = " + execution.getDeploymentId());
|
||||
log.info("taskEntity.getProcessDefinitionId() = " + execution.getProcessDefinitionId());
|
||||
// 对接统一平台生成办结
|
||||
//更新审批信息为完成
|
||||
ProcessApprovalRecordService recordService = SpringContextUtil.getBean(ProcessApprovalRecordService.class);
|
||||
LambdaQueryWrapper<ProcessApprovalRecord> wrapper1 = new LambdaQueryWrapper<>();
|
||||
wrapper1.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
|
||||
List<ProcessApprovalRecord> approvalRecordList = recordService.list(wrapper1);
|
||||
// 对接统一平台生成办结任务
|
||||
PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI = SpringContextUtil.getBean(PushWorkflowIntegrationAPI.class);
|
||||
List<HiworkTodoAdd> list = new ArrayList<>();
|
||||
for (ProcessApprovalRecord approvalRecord : approvalRecordList) {
|
||||
HiworkTodoAdd hiworkTodoAdd = new HiworkTodoAdd();
|
||||
hiworkTodoAdd.setRecordId(approvalRecord.getId());
|
||||
hiworkTodoAdd.setProcessDefinitionId(processDefinitionId);
|
||||
list.add(hiworkTodoAdd);
|
||||
}
|
||||
pushWorkflowIntegrationAPI.sendActivityComplete(list);
|
||||
}
|
||||
|
||||
private boolean isFirstNodeTask(ProcessApprovalRecord record) {
|
||||
|
||||
Reference in New Issue
Block a user