Skip to content

A
amos-boot-biz
Commit 7a5e6f78 authored by suhuiguang's avatar suhuiguang
Browse files
Options

1单位变更状态修改

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