优化：移装变更登记任务流程状态

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

@@ -326,7 +326,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
                 this.updateExecuteIds(instanceId, oldTransfer, "startWorkfow", workflowResult);
                 //生成代办
-                this.createToDoTask(Arrays.asList(workflowResult), oldTransfer, reginParams.getUserModel().getUserName());
+                this.createToDoTask(Arrays.asList(workflowResult), oldTransfer, submitType);
             }
         }
         return true;
@@ -1029,7 +1029,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     /**
      * 新增代办任务
      */
-    private void createToDoTask(List<WorkflowResultDto> sorkflows, JgChangeRegistrationTransfer transfer, String userName) {
+    private void createToDoTask(List<WorkflowResultDto> sorkflows, JgChangeRegistrationTransfer transfer, String submitType) {
         if (!ValidationUtil.isEmpty(sorkflows)) {
             List<TaskModelDto> toDoTasklist = new ArrayList<>();
             for (WorkflowResultDto sorkflow : sorkflows) {
@@ -1043,8 +1043,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 toDoTask.setTaskTypeLabel(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
                 toDoTask.setRelationId(transfer.getInstanceId());
                 toDoTask.setExecuteUserIds(sorkflow.getNextExecutorUserIds());
-                toDoTask.setTaskStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
-                toDoTask.setTaskStatusLabel(transfer.getStatus());
+                FlowStatusEnum flowStatusEnum = this.getTaskStatus(submitType);
+                toDoTask.setTaskStatus(flowStatusEnum.getCode());
+                toDoTask.setTaskStatusLabel(flowStatusEnum.getName());
+                toDoTask.setFlowStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
+                toDoTask.setFlowStatusLabel(transfer.getStatus());
+                toDoTask.setFlowCode(transfer.getNextTaskId());
                 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());
@@ -1080,6 +1084,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         return url;
     }
 
+    private FlowStatusEnum getTaskStatus(String operate) {
+        if ("0".equals(operate)) {
+            return FlowStatusEnum.TO_BE_FINISHED;
+        } else {
+            return FlowStatusEnum.REJECTED;
+        }
+    }
+
     /**
      * @return String
      * @deprecated 动态获取