|
@@ -795,12 +795,13 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
//[Permission(EPermission.DelayEntity)]
|
|
//[Permission(EPermission.DelayEntity)]
|
|
[HttpGet("delay/{id}")]
|
|
[HttpGet("delay/{id}")]
|
|
- public async Task<OrderDelay> DelayEntity(string id)
|
|
|
|
|
|
+ public async Task<OrderDelayDto> DelayEntity(string id)
|
|
{
|
|
{
|
|
- return await _orderDelayRepository.Queryable()
|
|
|
|
|
|
+ var model = await _orderDelayRepository.Queryable()
|
|
.Includes(x => x.Order)
|
|
.Includes(x => x.Order)
|
|
.Includes(x => x.Employee)
|
|
.Includes(x => x.Employee)
|
|
.FirstAsync(x => x.Id == id);
|
|
.FirstAsync(x => x.Id == id);
|
|
|
|
+ return _mapper.Map<OrderDelayDto>(model);
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|