Browse Source

Merge branch 'dev_dss' of Fengwo/hotline into dev

dengshengshuang 1 year ago
parent
commit
ec729cea83

+ 4 - 4
src/Hotline.Repository.SqlSugar/CallCenter/TrCallRecordRepository.cs

@@ -36,8 +36,8 @@ namespace Hotline.Repository.SqlSugar.CallCenter
             }
 
             var list = await Db.Reportable(dts).ToQueryable<DateTime>()
-                .LeftJoin<TrCallRecord>((it, o) => o.CreatedTime >= it.ColumnName && o.CreatedTime < it.ColumnName.AddHours(1))
-                .Where((it,o)=> o.CallDirection == ECallDirection.In)
+                .LeftJoin<TrCallRecord>((it, o) => o.CreatedTime >= it.ColumnName && o.CreatedTime < it.ColumnName.AddHours(1) && o.CallDirection == ECallDirection.In)
+                //.Where((it,o)=> o.CallDirection == ECallDirection.In)
                 .GroupBy(it => it.ColumnName)
                 .OrderBy(it => it.ColumnName)
                 .Select((it, o) => new BiCallDto()
@@ -84,8 +84,8 @@ namespace Hotline.Repository.SqlSugar.CallCenter
             }
 
             var list = await Db.Reportable(dts).ToQueryable<DateTime>()
-                .LeftJoin<TrCallRecord>((it, o) => o.CreatedTime >= it.ColumnName && o.CreatedTime < it.ColumnName.AddHours(1))
-                .Where((it, o) => o.CallDirection == ECallDirection.In)
+                .LeftJoin<TrCallRecord>((it, o) => o.CreatedTime >= it.ColumnName && o.CreatedTime < it.ColumnName.AddHours(1) && o.CallDirection == ECallDirection.In)
+                //.Where((it, o) => o.CallDirection == ECallDirection.In)
                 .GroupBy((it,o) => it.ColumnName)
                 .Select((it, o) => new TrCallHourDto()
                 {