Commit e28216c4 authored by zhangsen's avatar zhangsen

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 9a10ff87 1037bad9
......@@ -293,7 +293,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
taskModelDto.setStartDate(scrapCancel.getCreateDate());
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(scrapCancel, taskMessageDto);
taskMessageDto.setStatus(scrapCancel.getAuditStatus());
taskModelDto.setModel(taskMessageDto);
commonService.buildTaskModel(Collections.singletonList(taskModelDto));
}
......@@ -453,7 +452,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
modelDto.setNextExecuteUser(jgScrapCancelDto.getNextExecuteIds());
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(jgScrapCancelDto, taskMessageDto);
taskMessageDto.setStatus(jgScrapCancelDto.getAuditStatus());
modelDto.setModel(taskMessageDto);
commonService.buildTaskModel(Collections.singletonList(modelDto));
}
......
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