|
@@ -1340,14 +1340,14 @@ public class OrderController : BaseController
|
|
public async Task<PagedDto<OrderDelayDto>> DelayList([FromQuery] DelayListDto dto)
|
|
public async Task<PagedDto<OrderDelayDto>> DelayList([FromQuery] DelayListDto dto)
|
|
{
|
|
{
|
|
var (total, items) = await _orderDelayRepository.Queryable(canView: true)
|
|
var (total, items) = await _orderDelayRepository.Queryable(canView: true)
|
|
- .Includes(x => x.Order)
|
|
|
|
- .Includes(x => x.Workflow)
|
|
|
|
|
|
+ .Includes(d => d.Order)
|
|
|
|
+ .Includes(d => d.Workflow)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
|
|
d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
|
|
- .WhereIF(dto.IsApply == true, x => x.DelayState != EDelayState.Examining)
|
|
|
|
- .WhereIF(dto.IsApply == false, x => x.DelayState == EDelayState.Examining)
|
|
|
|
- .WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
|
|
|
|
- .OrderByDescending(x => x.ApplyDelayTime)
|
|
|
|
|
|
+ .WhereIF(dto.IsApply == true, d => d.DelayState != EDelayState.Examining)
|
|
|
|
+ .WhereIF(dto.IsApply == false, d => d.DelayState == EDelayState.Examining)
|
|
|
|
+ .WhereIF(dto.DelayState != null, d => d.DelayState == dto.DelayState)
|
|
|
|
+ .OrderByDescending(d => d.ApplyDelayTime)
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
|
|
return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
|
|
@@ -1364,15 +1364,15 @@ public class OrderController : BaseController
|
|
var isHandled = dto.IsApply.HasValue && dto.IsApply.Value;
|
|
var isHandled = dto.IsApply.HasValue && dto.IsApply.Value;
|
|
var (total, items) = await _orderDelayRepository
|
|
var (total, items) = await _orderDelayRepository
|
|
.Queryable(hasHandled: !isHandled)
|
|
.Queryable(hasHandled: !isHandled)
|
|
- .Includes(x => x.Order)
|
|
|
|
- .Includes(x => x.Workflow)
|
|
|
|
|
|
+ .Includes(d => d.Order)
|
|
|
|
+ .Includes(d => d.Workflow)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
d => d.Order.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
|
|
d => d.Order.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
|
|
- .WhereIF(dto.IsApply == true, x => x.DelayState != EDelayState.Examining)
|
|
|
|
- .WhereIF(dto.IsApply == false, x => x.DelayState == EDelayState.Examining)
|
|
|
|
|
|
+ .WhereIF(dto.IsApply == true, d => d.DelayState != EDelayState.Examining)
|
|
|
|
+ .WhereIF(dto.IsApply == false, d => d.DelayState == EDelayState.Examining)
|
|
//.WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
|
|
//.WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
|
|
//.Where(x=>x.DelayState == EDelayState.Examining)
|
|
//.Where(x=>x.DelayState == EDelayState.Examining)
|
|
- .OrderByDescending(x => x.ApplyDelayTime)
|
|
|
|
|
|
+ .OrderByDescending(d => d.ApplyDelayTime)
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
|
|
return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
|
|
@@ -1388,9 +1388,9 @@ public class OrderController : BaseController
|
|
public async Task<OrderDelayDto> DelayEntity(string id)
|
|
public async Task<OrderDelayDto> DelayEntity(string id)
|
|
{
|
|
{
|
|
var model = await _orderDelayRepository.Queryable()
|
|
var model = await _orderDelayRepository.Queryable()
|
|
- .Includes(x => x.Order)
|
|
|
|
- .Includes(x => x.Workflow)
|
|
|
|
- .FirstAsync(x => x.Id == id);
|
|
|
|
|
|
+ .Includes(d => d.Order)
|
|
|
|
+ .Includes(d => d.Workflow)
|
|
|
|
+ .FirstAsync(d => d.Id == id);
|
|
var rspModel = _mapper.Map<OrderDelayDto>(model);
|
|
var rspModel = _mapper.Map<OrderDelayDto>(model);
|
|
rspModel.IsCanHandle = model.CanHandle(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgId);
|
|
rspModel.IsCanHandle = model.CanHandle(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgId);
|
|
rspModel.Handle = false;
|
|
rspModel.Handle = false;
|