|
|
@@ -556,7 +556,7 @@ public class OrderController : BaseController
|
|
|
public async Task PublishedModify([FromBody] PublishOrderModifyDto dto)
|
|
|
{
|
|
|
var publishOrder = await _orderPublishRepository.Queryable()
|
|
|
- .Includes(x=>x.Order)
|
|
|
+ .Includes(x => x.Order)
|
|
|
.Where(x => x.Id == dto.Id)
|
|
|
.FirstAsync(HttpContext.RequestAborted);
|
|
|
|
|
|
@@ -2373,7 +2373,7 @@ public class OrderController : BaseController
|
|
|
var order = await _orderRepository.Queryable()
|
|
|
.Includes(d => d.OrderExtension)
|
|
|
.Includes(d => d.OrderDelays)
|
|
|
- .Includes(d=> d.OrderPublish)
|
|
|
+ .Includes(d => d.OrderPublish)
|
|
|
//.Includes(d => d.OrderScreens)
|
|
|
.Includes(d => d.OrderVisits, x => x.OrderVisitDetails)
|
|
|
.Includes(d => d.OrderVisits, x => x.Employee)
|
|
|
@@ -2439,7 +2439,7 @@ public class OrderController : BaseController
|
|
|
|
|
|
//dto.CanPrevious = canPrevious;
|
|
|
|
|
|
- if (order.OrderPublish!=null)
|
|
|
+ if (order.OrderPublish != null)
|
|
|
{
|
|
|
dto.PublishState = order.OrderPublish.PublishState;
|
|
|
}
|
|
|
@@ -3078,7 +3078,7 @@ public class OrderController : BaseController
|
|
|
// .OrderByIF(dto.IsHandled == true, d => d.StartTime, OrderByType.Desc)
|
|
|
// .OrderByIF(dto.IsHandled == false, d => d.CreationTime, OrderByType.Desc)
|
|
|
// .ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
|
-
|
|
|
+
|
|
|
var (total, items) = await _orderRepository.Queryable()
|
|
|
.LeftJoin<WorkflowStep>((d, step) => d.Id == step.ExternalId)
|
|
|
.Where((d, step) =>
|
xf