Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java

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