Merge branch 'dev' of http://git.12345lm.cn/Fengwo/hotline into dev

src/Hotline.Api/Controllers/Bi/BiCallController.cs

@@ -117,7 +117,7 @@ public class BiCallController : BaseController
         #endregion
         dto.EndTime = dto.EndTime.Value.AddDays(1).AddSeconds(-1);
 
-        return await _trCallRecordRepositoryEx.GetQueryCalls(dto.StartTime.Value, dto.EndTime.Value);
+        return await _trCallRecordRepositoryEx.GetQueryCalls(dto.StartTime.Value, dto.EndTime.Value, dto.Keyword);
 
     }
 
@@ -134,7 +134,7 @@ public class BiCallController : BaseController
 
         dto.QueryDto.EndTime = dto.QueryDto.EndTime.Value.AddDays(1).AddSeconds(-1);
 
-        var list = await _trCallRecordRepositoryEx.GetQueryCalls(dto.QueryDto.StartTime.Value, dto.QueryDto.EndTime.Value);
+        var list = await _trCallRecordRepositoryEx.GetQueryCalls(dto.QueryDto.StartTime.Value, dto.QueryDto.EndTime.Value, dto.QueryDto.Keyword);
 
         if (list != null && list.Count > 0)
         {
@@ -291,30 +291,30 @@ public class BiCallController : BaseController
     /// <returns></returns>
     [HttpGet("hourcall")]
     [AllowAnonymous]
-    public async Task<List<TrCallHourDto>> QueryHourCall([FromQuery]DateTime StartTime,DateTime? EndTime, string source)
+    public async Task<List<TrCallHourDto>> QueryHourCall([FromQuery] DateTime StartTime, DateTime? EndTime, string source)
     {
         //获取配置
         int noConnectByeTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.NoConnectByeTimes)?.SettingValue[0]);
         int effectiveTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.EffectiveTimes)?.SettingValue[0]);
         int connectByeTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.ConnectByeTimes)?.SettingValue[0]);
-        var list = await _trCallRecordRepositoryEx.GetCallHourList(StartTime, EndTime, noConnectByeTimes,effectiveTimes,connectByeTimes,source);
+        var list = await _trCallRecordRepositoryEx.GetCallHourList(StartTime, EndTime, noConnectByeTimes, effectiveTimes, connectByeTimes, source);
         return list;
     }
 
-	/// <summary>
-	/// 通话时段统计明细
-	/// </summary>
-	/// <returns></returns>
-	[HttpGet("hourcall_list")]
-	public async Task<object> QueryCallList([FromQuery] DateTime StartTime, DateTime? EndTime, string type, string source, TimeSpan? startHourTo , int pageIndex, int pageSize)
-	{
-		//获取配置
-		int noConnectByeTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.NoConnectByeTimes)?.SettingValue[0]);
-		int effectiveTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.EffectiveTimes)?.SettingValue[0]);
-		int connectByeTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.ConnectByeTimes)?.SettingValue[0]);
-		var list = await _trCallRecordRepositoryEx.GetCallList(StartTime, EndTime, noConnectByeTimes, effectiveTimes, connectByeTimes, type, source, startHourTo,pageIndex, pageSize);
-		return list;
-	}
+    /// <summary>
+    /// 通话时段统计明细
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("hourcall_list")]
+    public async Task<object> QueryCallList([FromQuery] DateTime StartTime, DateTime? EndTime, string type, string source, TimeSpan? startHourTo, int pageIndex, int pageSize)
+    {
+        //获取配置
+        int noConnectByeTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.NoConnectByeTimes)?.SettingValue[0]);
+        int effectiveTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.EffectiveTimes)?.SettingValue[0]);
+        int connectByeTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.ConnectByeTimes)?.SettingValue[0]);
+        var list = await _trCallRecordRepositoryEx.GetCallList(StartTime, EndTime, noConnectByeTimes, effectiveTimes, connectByeTimes, type, source, startHourTo, pageIndex, pageSize);
+        return list;
+    }
 
     /// <summary>
     /// 通话时段统计明细获取基本信息
@@ -332,15 +332,15 @@ public class BiCallController : BaseController
         return rsp;
     }
 
-	/// <summary>
-	/// 热线号码统计
-	/// </summary>
-	/// <param name="StartTime"></param>
-	/// <param name="EndTime"></param>
-	/// <returns></returns>
-	[AllowAnonymous]
+    /// <summary>
+    /// 热线号码统计
+    /// </summary>
+    /// <param name="StartTime"></param>
+    /// <param name="EndTime"></param>
+    /// <returns></returns>
+    [AllowAnonymous]
     [HttpGet("gateway-query")]
-    public async Task<List<CallHotLineDto>> QueryGateWay(DateTime StartTime, DateTime EndTime,string gateway)
+    public async Task<List<CallHotLineDto>> QueryGateWay(DateTime StartTime, DateTime EndTime, string gateway)
     {
         //获取配置
         int noConnectByeTimes = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.NoConnectByeTimes)?.SettingValue[0]);

src/Hotline.Application/CallCenter/DefaultCallApplication.cs

@@ -193,6 +193,7 @@ public abstract class DefaultCallApplication : ICallApplication
             TelNo = work.TelNo,
             QueueId = work.QueueId,
             StartTime = work.StartTime,
+            StaffNo = work.StaffNo
         });
     }
 

src/Hotline.Repository.SqlSugar/CallCenter/TrCallRecordRepository.cs

@@ -21,49 +21,49 @@ namespace Hotline.Repository.SqlSugar.CallCenter
         {
         }
 
-        public async Task<List<BiCallDto>?> GetQueryCalls(DateTime beginDate,DateTime endDate)
+        public async Task<List<BiCallDto>?> GetQueryCalls(DateTime beginDate, DateTime endDate, string? Line)
         {
-            TimeSpan timeDifference = endDate.Subtract(beginDate).Duration();
+            List<int> dts = new List<int>();
+            for (int i = 0; i < 24; i++)
+            {
+                dts.Add(i);
+            }
 
-            int hourDiff = (int)(timeDifference.TotalHours);
+            var listHour = Db.Reportable(dts).ToQueryable<int>();
 
-            //计算时间差
-            int hour = Convert.ToInt32((endDate - beginDate).TotalHours);
-
-            List<DateTime> dts = new List<DateTime>() { beginDate };
-            for (int i = 0; i < hour - 1; i++)
+            var list = Db.Queryable<TrCallRecord>()
+                 .Where(p => p.CreatedTime >= beginDate && p.CreatedTime <= endDate && p.CallDirection == ECallDirection.In)
+                 .WhereIF(!string.IsNullOrEmpty(Line), p => p.Gateway == Line)
+               .GroupBy(p => p.CreatedTime.Hour)
+               .Select(p => new
+               {
+                   Hour = p.CreatedTime.Hour, //小时段
+                   Total = SqlFunc.AggregateCount(p.Id),
+                   Answered = SqlFunc.AggregateSum(SqlFunc.IIF(p.AnsweredTime != null, 1, 0)), //应答数
+                   Hanguped = SqlFunc.AggregateSum(SqlFunc.IIF(p.AnsweredTime == null && p.EndBy != null && p.EndBy.Value == EEndBy.To, 1, 0)),//挂断数
+               })
+               // .GroupBy(p => p.Hour)
+               .MergeTable();
+
+            var listCall = await listHour.LeftJoin(list, (x, p) => x.ColumnName == p.Hour)
+                .OrderBy(x => x.ColumnName)
+               .Select((x, p) => new BiCallDto()
+               {
+                   Hour = x.ColumnName,
+                   Total = p.Total,
+                   Answered = p.Answered,
+                   Hanguped = p.Hanguped,
+               })
+               .ToListAsync();
+            foreach (var call in listCall)
             {
-                dts.Add(dts.Last().AddHours(1));
+                call.HourRange = call.Hour.ToString().PadLeft(2, '0') + ":00 - " + (call.Hour + 1).ToString().PadLeft(2, '0') + ":00";
             }
 
-            var list = await Db.Reportable(dts).ToQueryable<DateTime>()
-                .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()
-                {
-                    Hour = it.ColumnName.Hour, //小时段
-                    Total = SqlFunc.AggregateCount(o.Id),
-                    Answered = SqlFunc.AggregateSum(SqlFunc.IIF(o.AnsweredTime != null, 1, 0)), //应答数
-                    Hanguped = SqlFunc.AggregateSum(SqlFunc.IIF(o.AnsweredTime == null && o.EndBy != null && o.EndBy.Value == EEndBy.To, 1, 0)),//挂断数
-                })
-                .MergeTable()
-                .OrderBy(x => x.Hour)
-                .ToListAsync();
-            var returnList = list.GroupBy(x => x.Hour)
-               .Select(x => new BiCallDto()
-               {
-                   Hour = x.Key,
-                   Total = x.Sum(d=>d.Total),
-                   Answered = x.Sum(d=>d.Answered),
-                   Hanguped = x.Sum(d=>d.Hanguped),
-                   HourRange = x.Key.ToString().PadLeft(2, '0') + ":00 - " + (x.Key + 1).ToString().PadLeft(2, '0') + ":00",
-               }).OrderBy(x=>x.Hour).ToList();
-            return returnList;
+            return listCall;
         }
 
-        public async Task<List<TrCallHourDto>?> GetCallHourList(DateTime beginDate,DateTime? endDate,int noConnectByeTimes,int effectiveTimes,int connectByeTimes, string source)
+        public async Task<List<TrCallHourDto>?> GetCallHourList(DateTime beginDate, DateTime? endDate, int noConnectByeTimes, int effectiveTimes, int connectByeTimes, string source)
         {
             //计算小时差
             if (!endDate.HasValue)
@@ -77,7 +77,7 @@ namespace Hotline.Repository.SqlSugar.CallCenter
             TimeSpan timeDifference = endDate.Value.Subtract(beginDate).Duration();
 
             int hourDiff = (int)(timeDifference.TotalHours);
-           
+
             //计算时间差
             int hour = Convert.ToInt32((endDate - beginDate).Value.TotalHours);
 
@@ -89,82 +89,84 @@ 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) && o.CallDirection == ECallDirection.In)
-				 //.Where((it, o) => o.CallDirection == ECallDirection.In)
-				 .WhereIF(!string.IsNullOrEmpty(source), (it,o) => o.CDPN == source)
-				.GroupBy((it,o) => it.ColumnName)
+                 //.Where((it, o) => o.CallDirection == ECallDirection.In)
+                 .WhereIF(!string.IsNullOrEmpty(source), (it, o) => o.CDPN == source)
+                .GroupBy((it, o) => it.ColumnName)
                 .Select((it, o) => new TrCallHourDto()
                 {
-                    DateTimeTo = it.ColumnName, 
+                    DateTimeTo = it.ColumnName,
                     Hour = it.ColumnName.Hour, //小时段
                     EffectiveCount = SqlFunc.AggregateSum(SqlFunc.IIF(o.Duration >= effectiveTimes, 1, 0)),//有效接通
                     ConnectByeCount = SqlFunc.AggregateSum(SqlFunc.IIF(o.Duration > 0 && o.Duration <= connectByeTimes, 1, 0)), //接通秒挂
-                    NoConnectByeCount = SqlFunc.AggregateSum(SqlFunc.IIF(o.Duration == 0 && o.RingTimes <= noConnectByeTimes && o.RingTimes>0, 1, 0)), //未接通秒挂
+                    NoConnectByeCount = SqlFunc.AggregateSum(SqlFunc.IIF(o.Duration == 0 && o.RingTimes <= noConnectByeTimes && o.RingTimes > 0, 1, 0)), //未接通秒挂
                     QueueByeCount = SqlFunc.AggregateSum(SqlFunc.IIF(o.QueueTims > 0 && o.RingTimes == 0 && o.OnState == EOnState.NoOn, 1, 0)), //队列挂断
                     IvrByeCount = SqlFunc.AggregateSum(SqlFunc.IIF(o.BeginIvrTime.HasValue && !o.BeginQueueTime.HasValue && !o.BeginRingTime.HasValue && o.OnState == EOnState.NoOn, 1, 0)), //IVR挂断
                 })
                 .MergeTable()
-                .OrderBy(x=>x.Hour)
+                .OrderBy(x => x.Hour)
                 .ToListAsync();
 
-           var resultList = list.GroupBy(x => x.Hour)
-                .Select(x=> new TrCallHourDto() { 
-                    Hour = x.Key,
-                    HourTo = x.Key.ToString().PadLeft(2, '0') + ":00 - " + (x.Key).ToString().PadLeft(2, '0') + ":59",
-                    StartHourTo= x.Key.ToString().PadLeft(2, '0') + ":00",
-                    EndHourTo = x.Key.ToString().PadLeft(2, '0') + ":59",
-					EffectiveCount = x.Sum(d=>d.EffectiveCount),
-                    ConnectByeCount = x.Sum(d=>d.ConnectByeCount),
-                    NoConnectByeCount = x.Sum(d=>d.NoConnectByeCount),
-                    QueueByeCount = x.Sum(d=>d.QueueByeCount),
-                    IvrByeCount = x.Sum(d=>d.IvrByeCount),
-                }).OrderBy(x=>hour).ToList();
+            var resultList = list.GroupBy(x => x.Hour)
+                 .Select(x => new TrCallHourDto()
+                 {
+                     Hour = x.Key,
+                     HourTo = x.Key.ToString().PadLeft(2, '0') + ":00 - " + (x.Key).ToString().PadLeft(2, '0') + ":59",
+                     StartHourTo = x.Key.ToString().PadLeft(2, '0') + ":00",
+                     EndHourTo = x.Key.ToString().PadLeft(2, '0') + ":59",
+                     EffectiveCount = x.Sum(d => d.EffectiveCount),
+                     ConnectByeCount = x.Sum(d => d.ConnectByeCount),
+                     NoConnectByeCount = x.Sum(d => d.NoConnectByeCount),
+                     QueueByeCount = x.Sum(d => d.QueueByeCount),
+                     IvrByeCount = x.Sum(d => d.IvrByeCount),
+                 }).OrderBy(x => hour).ToList();
 
             return resultList;
         }
 
-		/// <summary>
-		/// 通话时段统计明细
-		/// </summary>
-		/// <returns></returns>
-        public async Task<object> GetCallList(DateTime beginDate, DateTime? endDate, int noConnectByeTimes, int effectiveTimes, int connectByeTimes, string type, string source , TimeSpan? startHourTo, int pageIndex, int pageSize)
+        /// <summary>
+        /// 通话时段统计明细
+        /// </summary>
+        /// <returns></returns>
+        public async Task<object> GetCallList(DateTime beginDate, DateTime? endDate, int noConnectByeTimes, int effectiveTimes, int connectByeTimes, string type, string source, TimeSpan? startHourTo, int pageIndex, int pageSize)
         {
             TimeSpan endHourTo = DateTime.Now.TimeOfDay;
-			if (startHourTo.HasValue)
-	        {
-                 endHourTo = startHourTo.Value.Add(new TimeSpan(1, 0, 0));
-			}
-	        endDate = endDate.Value.Date.AddDays(1).AddSeconds(-1);
-	        RefAsync<int> total = 0;
-			var res = await Db.Queryable<TrCallRecord>()
+            if (startHourTo.HasValue)
+            {
+                endHourTo = startHourTo.Value.Add(new TimeSpan(1, 0, 0));
+            }
+            endDate = endDate.Value.Date.AddDays(1).AddSeconds(-1);
+            RefAsync<int> total = 0;
+            var res = await Db.Queryable<TrCallRecord>()
                 .Where(x => x.CreatedTime >= beginDate && x.CreatedTime <= endDate)
                 .Where(x => x.CallDirection == ECallDirection.In)
                 .WhereIF(!string.IsNullOrEmpty(source), x => x.CDPN == source)
                 .WhereIF(!string.IsNullOrEmpty(type) && ("QueueBye".Equals(type) || "queueByeCount".Equals(type)), x => x.QueueTims > 0 && x.RingTimes == 0) //队列挂断
-				.WhereIF(!string.IsNullOrEmpty(type) &&("IvrBye".Equals(type)|| "ivrByeCount".Equals(type)) , x => x.BeginIvrTime.HasValue && !x.BeginQueueTime.HasValue && !x.BeginRingTime.HasValue && x.OnState == EOnState.NoOn)//IVR挂断
-				.WhereIF(!string.IsNullOrEmpty(type) && ("Effective".Equals(type) || "effectiveCount".Equals(type)), x => x.Duration >= effectiveTimes) //有效接通
-				.WhereIF(!string.IsNullOrEmpty(type) && "Invalid".Equals(type) , x => x.Duration > 0 && x.Duration < effectiveTimes)//无效接通
-				.WhereIF(!string.IsNullOrEmpty(type) && "connectByeCount".Equals(type) , x => x.Duration > 0 && x.Duration <= connectByeTimes)  //接通秒挂
-				.WhereIF(!string.IsNullOrEmpty(type) && "noConnectByeCount".Equals(type), x => x.Duration == 0 && x.RingTimes <= noConnectByeTimes && x.RingTimes > 0)  //未接通秒挂
-				.WhereIF(!string.IsNullOrEmpty(type) && "count".Equals(type), x => 
+                .WhereIF(!string.IsNullOrEmpty(type) && ("IvrBye".Equals(type) || "ivrByeCount".Equals(type)), x => x.BeginIvrTime.HasValue && !x.BeginQueueTime.HasValue && !x.BeginRingTime.HasValue && x.OnState == EOnState.NoOn)//IVR挂断
+                .WhereIF(!string.IsNullOrEmpty(type) && ("Effective".Equals(type) || "effectiveCount".Equals(type)), x => x.Duration >= effectiveTimes) //有效接通
+                .WhereIF(!string.IsNullOrEmpty(type) && "Invalid".Equals(type), x => x.Duration > 0 && x.Duration < effectiveTimes)//无效接通
+                .WhereIF(!string.IsNullOrEmpty(type) && "connectByeCount".Equals(type), x => x.Duration > 0 && x.Duration <= connectByeTimes)  //接通秒挂
+                .WhereIF(!string.IsNullOrEmpty(type) && "noConnectByeCount".Equals(type), x => x.Duration == 0 && x.RingTimes <= noConnectByeTimes && x.RingTimes > 0)  //未接通秒挂
+                .WhereIF(!string.IsNullOrEmpty(type) && "count".Equals(type), x =>
                 (x.Duration == 0 && x.RingTimes <= noConnectByeTimes && x.RingTimes > 0)  //未接通秒挂
-				|| (x.Duration > 0 && x.Duration <= connectByeTimes)  //接通秒挂
-				|| (x.Duration >= effectiveTimes)//有效接通
-				|| (x.BeginIvrTime.HasValue && !x.BeginQueueTime.HasValue && !x.BeginRingTime.HasValue && x.OnState == EOnState.NoOn) //IVR挂断
-				|| (x.QueueTims > 0 && x.RingTimes == 0))//队列挂断
-				.WhereIF(startHourTo.HasValue, x=>SqlFunc.ToTime(x.CreatedTime.ToString("HH:mm:ss")) >= startHourTo.Value && SqlFunc.ToTime(x.CreatedTime.ToString("HH:mm:ss")) < endHourTo)
-				.Select(x=> new { 
+                || (x.Duration > 0 && x.Duration <= connectByeTimes)  //接通秒挂
+                || (x.Duration >= effectiveTimes)//有效接通
+                || (x.BeginIvrTime.HasValue && !x.BeginQueueTime.HasValue && !x.BeginRingTime.HasValue && x.OnState == EOnState.NoOn) //IVR挂断
+                || (x.QueueTims > 0 && x.RingTimes == 0))//队列挂断
+                .WhereIF(startHourTo.HasValue, x => SqlFunc.ToTime(x.CreatedTime.ToString("HH:mm:ss")) >= startHourTo.Value && SqlFunc.ToTime(x.CreatedTime.ToString("HH:mm:ss")) < endHourTo)
+                .Select(x => new
+                {
                     CPN = x.CPN,
-                    CDPN= x.CDPN,
-					CreatedTime = x.CreatedTime
-				})
+                    CDPN = x.CDPN,
+                    CreatedTime = x.CreatedTime
+                })
                 .ToPageListAsync(pageIndex, pageSize, total);
-            return new { Data = res , Total = total.Value};
-		}
+            return new { Data = res, Total = total.Value };
+        }
 
-		public async Task<List<CallHotLineDto>> GetCallHotLineList(DateTime beginDate, DateTime endDate,string lineNum, int noConnectByeTimes, int effectiveTimes, int connectByeTimes,int ringTims)
+        public async Task<List<CallHotLineDto>> GetCallHotLineList(DateTime beginDate, DateTime endDate, string lineNum, int noConnectByeTimes, int effectiveTimes, int connectByeTimes, int ringTims)
         {
             endDate = endDate.AddDays(1).AddSeconds(-1);
-            var list =await Db.Queryable<TrCallRecord>()
+            var list = await Db.Queryable<TrCallRecord>()
                 .Where(x => x.CreatedTime >= beginDate && x.CreatedTime <= endDate)
                 .WhereIF(!string.IsNullOrEmpty(lineNum), x => x.Gateway == lineNum)
                 .GroupBy(x => x.Gateway)
@@ -175,9 +177,9 @@ namespace Hotline.Repository.SqlSugar.CallCenter
                     ConnectCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.CallDirection == ECallDirection.In && x.OnState == EOnState.On, 1, 0)),//接通
                     NoConnectByeCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.CallDirection == ECallDirection.In && x.Duration == 0 && x.RingTimes <= noConnectByeTimes && x.RingTimes > 0, 1, 0)), //未接通秒挂
                     EffectiveCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.CallDirection == ECallDirection.In && x.Duration >= effectiveTimes, 1, 0)),//有效接通
-                    DurationSum = SqlFunc.AggregateSum(SqlFunc.IIF(x.CallDirection == ECallDirection.In && x.OnState == EOnState.On,x.Duration,0)),//通话总时长
+                    DurationSum = SqlFunc.AggregateSum(SqlFunc.IIF(x.CallDirection == ECallDirection.In && x.OnState == EOnState.On, x.Duration, 0)),//通话总时长
                     ConnectByeCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.CallDirection == ECallDirection.In && x.Duration > 0 && x.Duration <= connectByeTimes, 1, 0)), //接通秒挂
-                    TimelyAnswerCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.CallDirection == ECallDirection.In && x.OnState == EOnState.On && x.RingTimes<= ringTims,1,0))//及时应答
+                    TimelyAnswerCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.CallDirection == ECallDirection.In && x.OnState == EOnState.On && x.RingTimes <= ringTims, 1, 0))//及时应答
                 }).ToListAsync();
 
             return list;

src/Hotline.Share/Dtos/CallCenter/CallNativeDto.cs

@@ -16,6 +16,7 @@ namespace Hotline.Share.Dtos.CallCenter
         public string CallNo { get; set; }
 
         public ECallDirection Direction { get; set; }
+        public string DirectionText => Direction.GetDescription();
 
         /// <summary>
         /// 主叫
@@ -36,36 +37,44 @@ namespace Hotline.Share.Dtos.CallCenter
         /// 挂断方
         /// </summary>
         public EEndBy? EndBy { get; set; }
+
         public string? EndByText => EndBy?.GetDescription() ?? string.Empty;
 
         /// <summary>
         /// IVR开始时间
         /// </summary>
         public DateTime? BeginIvrTime { get; set; }
+
         /// <summary>
         /// IVR结束时间
         /// </summary>
         public DateTime? EndIvrTime { get; set; }
+
         /// <summary>
         /// 开始等待时间
         /// </summary>
         public DateTime? BeginQueueTime { get; set; }
+
         /// <summary>
         /// 结束等待时间
         /// </summary>
         public DateTime? EndQueueTime { get; set; }
+
         /// <summary>
         /// 开始振铃时间
         /// </summary>
         public DateTime? BeginRingTime { get; set; }
+
         /// <summary>
         /// 结束振铃时间
         /// </summary>
         public DateTime? EndRingTime { get; set; }
+
         /// <summary>
         /// 接听时间
         /// </summary>
         public DateTime? AnsweredTime { get; set; }
+
         /// <summary>
         /// 挂机时间
         /// </summary>
@@ -122,4 +131,4 @@ namespace Hotline.Share.Dtos.CallCenter
 
         public string? Title { get; set; }
     }
-}
+}

src/Hotline.Share/Dtos/TrCallCenter/TrTelDao.cs

@@ -210,6 +210,12 @@ namespace Hotline.Share.Dtos.TrCallCenter
         public bool? IsCallEndArrange { get; set; }
 
         public bool? IsTelMute { get; set; }
+
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string? StaffNo { get; set; }
+        
         public int Second => CalcSecond();
 
         public ETelModel? TelModel { get; set; }

src/Hotline/CallCenter/Calls/ITrCallRecordRepository.cs

@@ -6,7 +6,7 @@ namespace Hotline.CallCenter.Calls
     public interface ITrCallRecordRepository
     {
 
-        Task<List<BiCallDto>?> GetQueryCalls(DateTime beginDate, DateTime endDate);
+        Task<List<BiCallDto>?> GetQueryCalls(DateTime beginDate, DateTime endDate, string? Line);
         Task<List<TrCallHourDto>?> GetCallHourList(DateTime beginDate, DateTime? endDate, int noConnectByeTimes, int effectiveTimes,int connectByeTimes, string source);