Commit 938dbe81 authored by 刘凡's avatar 刘凡

优化:移装变更登记,通过驳回时报错的问题

parent 6d212268
...@@ -354,10 +354,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -354,10 +354,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
WorkflowResultDto workflowResult = new WorkflowResultDto(); WorkflowResultDto workflowResult = new WorkflowResultDto();
JgChangeRegistrationTransfer transfer = this.getById(id); JgChangeRegistrationTransfer transfer = this.getById(id);
try { try {
String taskId = transfer.getNextTaskId();
//组装信息 //组装信息
TaskResultDTO dto = new TaskResultDTO(); TaskResultDTO dto = new TaskResultDTO();
dto.setResultCode("approvalStatus"); dto.setResultCode("approvalStatus");
dto.setTaskId(transfer.getNextTaskId()); 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);
...@@ -366,7 +367,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -366,7 +367,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
map.put("approvalStatus", "提交"); map.put("approvalStatus", "提交");
} }
//执行流程 //执行流程
ProcessTaskDTO complete = icmWorkflowService.complete(instanceId, dto); ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0); workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
} catch (Exception e) { } catch (Exception e) {
...@@ -1044,7 +1045,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -1044,7 +1045,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
toDoTask.setExecuteUserIds(sorkflow.getNextExecutorUserIds()); toDoTask.setExecuteUserIds(sorkflow.getNextExecutorUserIds());
toDoTask.setTaskStatus(commonService.getDictionaryCodeByName(transfer.getStatus())); toDoTask.setTaskStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
toDoTask.setTaskStatusLabel(transfer.getStatus()); toDoTask.setTaskStatusLabel(transfer.getStatus());
String url = this.getUrl(JG_CHANGE_REGISTRATION.getCode(), "look"); String url = this.getUrl(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode(), "look");
String format = String.format(url, transfer.getSequenceNbr(), transfer.getNextExecutorIds(), transfer.getNextExecutorIds(), String format = String.format(url, transfer.getSequenceNbr(), transfer.getNextExecutorIds(), transfer.getNextExecutorIds(),
transfer.getAuditStatus(), transfer.getInstanceId()); transfer.getAuditStatus(), transfer.getInstanceId());
toDoTask.setRoutePath(format); toDoTask.setRoutePath(format);
......
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