|
|
@@ -592,11 +592,11 @@ namespace Hotline.Repository.SqlSugar.Orders
|
|
|
.MergeTable();
|
|
|
|
|
|
var listOrg = await Db.Queryable<SystemDicData>()
|
|
|
- .LeftJoin(listOrder, (s, p) => s.DicDataValue == p.SourceChannelCode)
|
|
|
+ .InnerJoin(listOrder, (s, p) => s.DicDataValue == p.SourceChannelCode)
|
|
|
.Where((s, p) => s.DicTypeCode == "SourceChannel")
|
|
|
.GroupBy((s, p) => s.DicDataValue).GroupBy((s, p) => s.DicDataName)
|
|
|
.GroupBy((s, p) => p.Hour)
|
|
|
- .OrderBy((s, p) => s.DicDataValue)
|
|
|
+ .OrderBy((s, p) => p.Hour)
|
|
|
.Select((s, p) => new
|
|
|
{
|
|
|
Hour = p.Hour,
|
|
|
@@ -604,7 +604,7 @@ namespace Hotline.Repository.SqlSugar.Orders
|
|
|
DicDataValue = s.DicDataValue,
|
|
|
DicDataName = s.DicDataName
|
|
|
})
|
|
|
- .ToPivotListAsync(p => p.DicDataName, p => p.Hour, p => p.Sum(x => x.count));
|
|
|
+ .ToPivotListAsync(p => p.DicDataValue, p => p.Hour, p => p.Sum(x => x.count));
|
|
|
return listOrg;
|
|
|
|
|
|
}
|
|
|
@@ -633,12 +633,12 @@ namespace Hotline.Repository.SqlSugar.Orders
|
|
|
.OrderBy((s, p) => s.DicDataValue)
|
|
|
.Select((s, p) => new
|
|
|
{
|
|
|
- Hour = p.Hour,
|
|
|
+ Hour = SqlFunc.IIF(p.Hour == null || p.Hour == "", "0", p.Hour),
|
|
|
count = SqlFunc.AggregateSum(SqlFunc.IIF(p.SourceChannelCode != null && p.SourceChannelCode != "", 1, 0)),
|
|
|
DicDataValue = s.DicDataValue,
|
|
|
DicDataName = s.DicDataName
|
|
|
})
|
|
|
- .ToPivotTableAsync(p => p.DicDataName, p => p.Hour, p => p.Sum(x => x.count));
|
|
|
+ .ToPivotTableAsync(p => p.DicDataValue, p => p.Hour, p => p.Sum(x => x.count));
|
|
|
return InitDatatTable(listOrg, dto.AddColumnName);
|
|
|
}
|
|
|
|
