Commit d9284845 authored by 刘凡's avatar 刘凡

优化:移装变更 去掉流程接口调用时的try catch

parent 245211d5
...@@ -353,29 +353,27 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -353,29 +353,27 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
public void flowExecute(Long id, String instanceId, String operate, String comment) { public void flowExecute(Long id, String instanceId, String operate, String comment) {
WorkflowResultDto workflowResult = new WorkflowResultDto(); WorkflowResultDto workflowResult = new WorkflowResultDto();
JgChangeRegistrationTransfer transfer = this.getById(id); JgChangeRegistrationTransfer transfer = this.getById(id);
try {
String taskId = transfer.getNextTaskId(); String taskId = transfer.getNextTaskId();
//组装信息 //组装信息
TaskResultDTO dto = new TaskResultDTO(); TaskResultDTO dto = new TaskResultDTO();
dto.setResultCode("approvalStatus"); dto.setResultCode("approvalStatus");
dto.setTaskId(taskId); dto.setTaskId(taskId);
dto.setComment(comment); dto.setComment(comment);
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", operate); map.put("approvalStatus", operate);
dto.setVariable(map); dto.setVariable(map);
//下一节点执行人单位(下节点接收机构code) //下一节点执行人单位(下节点接收机构code)
dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, transfer)); dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, transfer));
if (!ObjectUtils.isEmpty(transfer) && (transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack()) || transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject()))) { if (!ObjectUtils.isEmpty(transfer) && (transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack()) || transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject()))) {
map.put("approvalStatus", "提交"); map.put("approvalStatus", "提交");
}
//执行流程
ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
// 更新下一步执行人
this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
} catch (Exception e) {
e.printStackTrace();
} }
//执行流程
ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
// 更新下一步执行人
this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
} }
/** /**
...@@ -1032,24 +1030,19 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -1032,24 +1030,19 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
* 启动工作流 * 启动工作流
*/ */
private WorkflowResultDto startWorkFlork(String receiveOrgCreditCode) { private WorkflowResultDto startWorkFlork(String receiveOrgCreditCode) {
try { ActWorkflowBatchDTO workflowBatchParams = new ActWorkflowBatchDTO();
ActWorkflowBatchDTO workflowBatchParams = new ActWorkflowBatchDTO(); List<ActWorkflowStartDTO> workflowList = new ArrayList<>();
List<ActWorkflowStartDTO> workflowList = new ArrayList<>(); ActWorkflowStartDTO workflow = new ActWorkflowStartDTO();
ActWorkflowStartDTO workflow = new ActWorkflowStartDTO(); workflow.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
workflow.setProcessDefinitionKey(PROCESS_DEFINITION_KEY); workflow.setBusinessKey("submit");
workflow.setBusinessKey("submit"); workflow.setCompleteFirstTask(Boolean.TRUE);
workflow.setCompleteFirstTask(Boolean.TRUE); //下一节点执行人单位(下节点接收机构code)
//下一节点执行人单位(下节点接收机构code) workflow.setNextExecuteUserCompanyCode(receiveOrgCreditCode);
workflow.setNextExecuteUserCompanyCode(receiveOrgCreditCode); workflowList.add(workflow);
workflowList.add(workflow); workflowBatchParams.setProcess(workflowList);
workflowBatchParams.setProcess(workflowList); List<ProcessTaskDTO> processTasks = icmWorkflowService.startBatch(workflowBatchParams);
List<ProcessTaskDTO> processTasks = icmWorkflowService.startBatch(workflowBatchParams); // 组装工作流返回的数据
// 组装工作流返回的数据 return commonService.buildWorkFlowInfo(processTasks).get(0);
return commonService.buildWorkFlowInfo(processTasks).get(0);
} catch (Exception e) {
log.error("提交失败:{}", e);
throw new BadRequest("提交失败" + e.getMessage());
}
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment