|
@@ -256,6 +256,7 @@ namespace Hotline.Api.Controllers
|
|
|
var list = await _orderRepository.Queryable()
|
|
|
.Where(p => p.CreationTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")))
|
|
|
.Where(p => p.CreationTime <= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")))
|
|
|
+ .Where(p => p.AcceptTypeCode != null && p.AcceptType != null)
|
|
|
.Select(it => new
|
|
|
{
|
|
|
it.AcceptType,
|
|
@@ -310,7 +311,7 @@ namespace Hotline.Api.Controllers
|
|
|
.LeftJoin<Order>((it, o) => it.Id == o.HotspotId)
|
|
|
.Where((it, o) => o.CreationTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")))
|
|
|
.Where((it, o) => o.CreationTime <= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")))
|
|
|
- .Where((it, o) => o.Id != null)
|
|
|
+ .Where((it, o) => o.Id != null && o.HotspotId != null)
|
|
|
.GroupBy((it, o) => new { Id = it.Id.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("2")) })
|
|
|
.Select((it, o) => new
|
|
|
{
|