|
@@ -256,7 +256,7 @@ namespace Hotline.Api.Controllers
|
|
|
.Where(d => d.Order.Id != null)
|
|
|
.Where(d => d.Order.CreationTime >= StartDate && d.Order.CreationTime <= EndDate)
|
|
|
.GroupBy(d => d.Id)
|
|
|
- .Select(d => new
|
|
|
+ .Select(d => new EventClassificationOrderCountDto
|
|
|
{
|
|
|
TheClueIsTrue = SqlFunc.AggregateSum(SqlFunc.IIF(d.IsTheClueTrue.HasValue && d.IsTheClueTrue.Value == true, 1, 0)),
|
|
|
TheClueIsNotTrue = SqlFunc.AggregateSum(SqlFunc.IIF(d.IsTheClueTrue.HasValue && d.IsTheClueTrue.Value == false, 1, 0)),
|
|
@@ -267,10 +267,10 @@ namespace Hotline.Api.Controllers
|
|
|
|
|
|
var orderCount = new
|
|
|
{
|
|
|
- TheClueIsTrue = data.Count > 0 ? data[0].TheClueIsTrue : 0,
|
|
|
- TheClueIsNotTrue = data.Count > 0 ? data?[0].TheClueIsNotTrue : 0,
|
|
|
- EnforcementOrder = data.Count > 0 ? data?[0].EnforcementOrder : 0,
|
|
|
- PassTheBuckOrder = data.Count > 0 ? data?[0].PassTheBuckOrder : 0
|
|
|
+ TheClueIsTrue = data.Sum(x => x.TheClueIsTrue),
|
|
|
+ TheClueIsNotTrue = data.Sum(x => x.TheClueIsNotTrue),
|
|
|
+ EnforcementOrder = data.Sum(x => x.EnforcementOrder),
|
|
|
+ PassTheBuckOrder = data.Sum(x => x.PassTheBuckOrder),
|
|
|
};
|
|
|
|
|
|
return new { List = items, Total = total, OrderCount = orderCount };
|