Commit 0ec71413 authored by 韩桐桐's avatar 韩桐桐

BUG:28682 【现场问题】工作台-改造告知,业务发起单位是监管单位

parent 07d169ce
...@@ -713,7 +713,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -713,7 +713,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
.taskContent(String.format("来自%s的业务办理,【申请单号:%s】", item.getEquListName(), item.getApplyNo())) .taskContent(String.format("来自%s的业务办理,【申请单号:%s】", item.getEquListName(), item.getApplyNo()))
.taskDesc(String.format("来自%s的业务办理,【申请单号:%s】", item.getEquListName(), item.getApplyNo())) .taskDesc(String.format("来自%s的业务办理,【申请单号:%s】", item.getEquListName(), item.getApplyNo()))
.startUserId(item.getCreateUserId()).startUser(item.getCreateUserName()) .startUserId(item.getCreateUserId()).startUser(item.getCreateUserName())
.startUserCompanyName(item.getCreateUserCompanyName()) .startUserCompanyName(item.getInstallUnitName())
.startDate(item.getCreateDate()) .startDate(item.getCreateDate())
.model(taskMessageDto) .model(taskMessageDto)
.nextExecuteUser(item.getNextExecuteIds()) .nextExecuteUser(item.getNextExecuteIds())
...@@ -1274,7 +1274,27 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -1274,7 +1274,27 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
private void createNewTodo(JgReformNotice transfer, WorkflowResultDto workflowResultDto, TaskV2Model taskV2Model, FlowStatusEnum statusEnum) { private void createNewTodo(JgReformNotice transfer, WorkflowResultDto workflowResultDto, TaskV2Model taskV2Model, FlowStatusEnum statusEnum) {
TaskMessageDto taskMessageDto = new TaskMessageDto(); TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(transfer, taskMessageDto); BeanUtil.copyProperties(transfer, taskMessageDto);
TaskModelDto taskModelDto = TaskModelDto.builder().flowCreateDate(taskV2Model.getFlowCreateDate()).taskName(workflowResultDto.getNextTaskName()).taskCode(taskV2Model.getTaskCode()).taskType(taskV2Model.getTaskType()).taskTypeLabel(taskV2Model.getTaskTypeLabel()).relationId(taskV2Model.getRelationId()).executeUserIds(workflowResultDto.getNextExecutorUserIds()).taskStatusLabel(statusEnum.getName()).flowStatus(statusEnum.getCode()).flowCode(workflowResultDto.getNextTaskId()).flowStatusLabel(statusEnum.getName()).taskContent(String.format("来自%s的业务办理,【申请单号:%s】", transfer.getEquListName(), transfer.getApplyNo())).taskDesc(String.format("来自%s的业务办理,【申请单号%s】", transfer.getEquList(), transfer.getApplyNo())).startUserCompanyName(transfer.getCreateUserCompanyName()).startUserId(taskV2Model.getStartUserId()).startUser(taskV2Model.getStartUser()).startDate(taskV2Model.getStartDate()).model(taskMessageDto).pageType(statusEnum.getCode() == 6614 ? "edit" : "look").nextExecuteUser(workflowResultDto.getNextExecutorRoleIds()).build(); TaskModelDto taskModelDto = TaskModelDto.builder()
.flowCreateDate(taskV2Model.getFlowCreateDate())
.taskName(workflowResultDto.getNextTaskName())
.taskCode(taskV2Model.getTaskCode())
.taskType(taskV2Model.getTaskType())
.taskTypeLabel(taskV2Model.getTaskTypeLabel())
.relationId(taskV2Model.getRelationId())
.executeUserIds(workflowResultDto.getNextExecutorUserIds())
.taskStatusLabel(statusEnum.getName())
.flowStatus(statusEnum.getCode())
.flowCode(workflowResultDto.getNextTaskId())
.flowStatusLabel(statusEnum.getName())
.taskContent(String.format("来自%s的业务办理,【申请单号:%s】", transfer.getEquListName(), transfer.getApplyNo()))
.taskDesc(String.format("来自%s的业务办理,【申请单号%s】", transfer.getEquList(), transfer.getApplyNo()))
.startUserCompanyName(transfer.getInstallUnitName())
.startUserId(taskV2Model.getStartUserId())
.startUser(taskV2Model.getStartUser())
.startDate(taskV2Model.getStartDate())
.model(taskMessageDto).pageType(statusEnum.getCode() == 6614 ? "edit" : "look")
.nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
.build();
commonService.buildTaskModel(Collections.singletonList(taskModelDto)); commonService.buildTaskModel(Collections.singletonList(taskModelDto));
} }
......
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