|
@@ -2139,7 +2139,7 @@ public class OrderController : BaseController
|
|
/// 查询待办工单
|
|
/// 查询待办工单
|
|
/// </summary>
|
|
/// </summary>
|
|
[HttpGet("waited")]
|
|
[HttpGet("waited")]
|
|
- public async Task<PagedDto<OrderWaitedDto>> QueryWaited([FromQuery] QueryOrderWaitedDto dto)
|
|
|
|
|
|
+ public async Task<PagedDto<OrderDto>> QueryWaited([FromQuery] QueryOrderWaitedDto dto)
|
|
{
|
|
{
|
|
EWorkflowStepStatus[] handleStatuses = Array.Empty<EWorkflowStepStatus>();
|
|
EWorkflowStepStatus[] handleStatuses = Array.Empty<EWorkflowStepStatus>();
|
|
if (dto.IsHandled.HasValue)
|
|
if (dto.IsHandled.HasValue)
|
|
@@ -2158,16 +2158,16 @@ public class OrderController : BaseController
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
(s, w, o) => o.No.Contains(dto.Keyword) || o.Title.Contains(dto.Keyword))
|
|
(s, w, o) => o.No.Contains(dto.Keyword) || o.Title.Contains(dto.Keyword))
|
|
.OrderByDescending((s) => s.StepExpiredTime)
|
|
.OrderByDescending((s) => s.StepExpiredTime)
|
|
- .Select((s, w, o) => new OrderWaitedDto
|
|
|
|
|
|
+ .Select((s, w, o) => new OrderDto
|
|
{
|
|
{
|
|
Id = o.Id,
|
|
Id = o.Id,
|
|
ExpiredTime = o.ExpiredTime,
|
|
ExpiredTime = o.ExpiredTime,
|
|
- StepExpiredTime = s.StepExpiredTime,
|
|
|
|
|
|
+ //StepExpiredTime = s.StepExpiredTime,
|
|
Status = o.Status
|
|
Status = o.Status
|
|
}, true)
|
|
}, true)
|
|
.ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
|
|
.ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
|
|
|
|
|
|
- return new PagedDto<OrderWaitedDto>(total, dtos);
|
|
|
|
|
|
+ return new PagedDto<OrderDto>(total, dtos);
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|