Merge branch 'dev' of http://110.188.24.182:10023/Fengwo/hotline into dev

src/Hotline.Application/Mappers/CallMapperConfigs.cs

@@ -82,6 +82,7 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.RingDuration, s => s.RingTime)
                 .Map(d => d.WaitDuration, s => s.WaitTime)
                 .Map(d => d.AudioFile, s => s.AudioFile)
+                .Map(d => d.AgentTransferNumber, s => s.TransCalled)
                 .AfterMapping((s, d) =>
                 {
                     //todo 等待兴唐补全Disposition字段

src/Hotline.Application/StatisticalReport/CallReport/CallReportApplicationBase.cs

@@ -51,7 +51,7 @@ public abstract class CallReportApplicationBase : ICallReportApplication
         return await _callNativeRepository.GetCallHourList(dto.StartTime, dto.EndTime, noConnectByeTimes, effectiveTimes, connectByeTimes, dto.Source);
     }
 
-    public async Task<TotalData<BiSeatSwitchDto>> GetCallListAsync(QueryCallListDto dto, CancellationToken requestAborted)
+    public virtual async Task<TotalData<BiSeatSwitchDto>> GetCallListAsync(QueryCallListDto dto, CancellationToken requestAborted)
     {
         int noConnectByeTimes = _systemSettingCacheManager.NoConnectByeTimes;
         int effectiveTimes = _systemSettingCacheManager.EffectiveTimes;

src/Hotline.Application/StatisticalReport/CallReport/YiBinCallReportApplication.cs

@@ -233,4 +233,14 @@ public class YiBinCallReportApplication : CallReportApplicationBase, ICallReport
         var ringTims = _systemSettingCacheManager.RingTimes;
         return await _trCallRecordRepositoryEx.GetCallHotLineList(dto.StartTime, dto.EndTime, dto.Gateway, noConnectByeTimes, effectiveTimes, connectByeTimes, ringTims); ;
     }
+
+    public override async Task<TotalData<BiSeatSwitchDto>> GetCallListAsync(QueryCallListDto dto, CancellationToken requestAborted)
+    {
+        //获取配置
+        int noConnectByeTimes = _systemSettingCacheManager.NoConnectByeTimes;
+        int effectiveTimes = _systemSettingCacheManager.EffectiveTimes;
+        int connectByeTimes = _systemSettingCacheManager.ConnectByeTimes;
+        var list = await _trCallRecordRepositoryEx.GetCallList(dto, noConnectByeTimes, effectiveTimes, connectByeTimes);
+        return list;
+    }
 }

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

@@ -21,13 +21,7 @@ public record BiQueryCallsDto : ReportPagedRequest
     [Required(ErrorMessage = "结束时间不能为空")]
     public override DateTime? EndTime
     {
-        get {
-            if (base.EndTime == null)
-                throw new InvalidOperationException("结束时间不能为空");
-            if (base.EndTime.Value.Hour == 0 && base.EndTime.Value.Minute == 0 && base.EndTime.Value.Second == 0)
-                return base.EndTime.Value.AddDays(1).AddSeconds(-1);
-            return base.EndTime; 
-        }
+        get { return base.EndTime ??  throw new InvalidOperationException("结束时间不能为空"); }
         set { base.EndTime = value; }
     }
 

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

@@ -154,6 +154,8 @@ public class BiSeatRestDto
 
 public class BiSeatSwitchDto
 {
+    public string Id { get; set; }
+
     public string? UserId { get; set; }
 
     public string? UserName { get; set; }

src/XingTang.Sdk/XingtangCall.cs

@@ -133,6 +133,9 @@ public class XingtangCall
     public int? CallForword { get; set; }
     public DateTime? RingStartTime { get; set; }
 
+    /// <summary>
+    /// 转接号码
+    /// </summary>
     [SugarColumn(ColumnName = "trans_called")]
     public string? TransCalled { get; set; }