Commit 0f35665f authored by 刘林's avatar 刘林

fix(JG):改造告知Bug修改

parent 135cb789
...@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils; ...@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto; import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto; import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice; import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
...@@ -514,6 +515,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -514,6 +515,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
* @return 代办信息 * @return 代办信息
*/ */
private TaskModelDto buildTaskModelDto(JgReformNotice item, WorkflowResultDto workflowResultDto) { private TaskModelDto buildTaskModelDto(JgReformNotice item, WorkflowResultDto workflowResultDto) {
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(item, taskMessageDto);
return TaskModelDto.builder() return TaskModelDto.builder()
.flowCreateDate(item.getCreateDate()) .flowCreateDate(item.getCreateDate())
.taskName(workflowResultDto.getNextTaskName()) .taskName(workflowResultDto.getNextTaskName())
...@@ -533,7 +536,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -533,7 +536,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
.startUser(item.getCreateUserName()) .startUser(item.getCreateUserName())
.startUserCompanyName(item.getCreateUserCompanyName()) .startUserCompanyName(item.getCreateUserCompanyName())
.startDate(item.getCreateDate()) .startDate(item.getCreateDate())
.model(item) .model(taskMessageDto)
.nextExecuteUser(item.getNextExecuteIds()) .nextExecuteUser(item.getNextExecuteIds())
.build(); .build();
} }
...@@ -796,6 +799,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -796,6 +799,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
* @param taskV2Model 代办信息 * @param taskV2Model 代办信息
*/ */
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();
BeanUtil.copyProperties(transfer, taskMessageDto);
TaskModelDto taskModelDto = TaskModelDto.builder() TaskModelDto taskModelDto = TaskModelDto.builder()
.flowCreateDate(taskV2Model.getFlowCreateDate()) .flowCreateDate(taskV2Model.getFlowCreateDate())
.taskName(workflowResultDto.getNextTaskName()) .taskName(workflowResultDto.getNextTaskName())
...@@ -813,7 +818,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -813,7 +818,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
.startUserId(taskV2Model.getStartUserId()) .startUserId(taskV2Model.getStartUserId())
.startUser(taskV2Model.getStartUser()) .startUser(taskV2Model.getStartUser())
.startDate(taskV2Model.getStartDate()) .startDate(taskV2Model.getStartDate())
.model(transfer) .model(taskMessageDto)
.pageType(statusEnum.getCode() == 6614 ? "edit" : "look") .pageType(statusEnum.getCode() == 6614 ? "edit" : "look")
.nextExecuteUser(workflowResultDto.getNextExecutorRoleIds()) .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
.build(); .build();
......
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