1单位变更状态修改

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/JgChangeRegistrationNameServiceImpl.java

@@ -210,9 +210,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
             taskModelDto.setRelationId(dto.getInstanceId());
             taskModelDto.setExecuteUserIds(nextUserIds);
-            taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getAuditStatus()));
-            taskModelDto.setTaskStatusLabel(dto.getAuditStatus());
+            FlowStatusEnum flowStatusEnum = this.getTaskStatus(submitType);
+            taskModelDto.setTaskStatus(flowStatusEnum.getCode());
+            taskModelDto.setTaskStatusLabel(flowStatusEnum.getName());
+            taskModelDto.setFlowStatus(this.getTaskStatusByName(dto.getAuditStatus()));
+            taskModelDto.setFlowStatusLabel(dto.getAuditStatus());
             taskModelDto.setStartUserId(dto.getCreateUserId());
+            taskModelDto.setFlowCode(dto.getNextTaskId());
             taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
             taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
@@ -271,6 +275,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                     jgChangeRegistrationName.setInstanceId(instanceId);
                     jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
                     jgChangeRegistrationName.setNextTaskId(nextTaskId);
+                    jgChangeRegistrationName.setAuditStatus(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass());
                     // 创建待办
                     createTaskModel(jgChangeRegistrationName,taskName,"1", nextUserIds);
                 } catch (Exception e) {
@@ -293,7 +298,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 }
                 jgChangeRegistrationName.setPromoter(RequestContext.getExeUserId());
                 jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
-                jgChangeRegistrationName.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass()));
+                jgChangeRegistrationName.setAuditStatus(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass());
                 jgChangeRegistrationName.setNextTaskId(nextTaskId);
                 executeOneStep(jgChangeRegistrationName, taskName, nextUserIds, op);
             }
@@ -315,8 +320,11 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         taskModelDto.setTaskCode(jgChangeRegistrationName.getApplyNo());
         taskV2Model.setExecuteUserIds(nextUserIds);
         taskV2Model.setRelationId(jgChangeRegistrationName.getInstanceId());
-        taskV2Model.setTaskStatus(this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
-        taskV2Model.setTaskStatusLabel(jgChangeRegistrationName.getAuditStatus());
+        FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
+        taskModelDto.setTaskStatus(flowStatusEnum.getCode());
+        taskModelDto.setTaskStatusLabel(flowStatusEnum.getName());
+        taskModelDto.setFlowStatus(this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
+        taskModelDto.setFlowStatusLabel(jgChangeRegistrationName.getAuditStatus());
         taskV2Model.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
         taskModelDto.setStartUser(jgChangeRegistrationName.getCreateUserName());
         taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());