修复临时保存,修复通话统计无效数据

src/Hotline.Api/Controllers/OrderController.cs

@@ -3753,7 +3753,7 @@ public class OrderController : BaseController
         rsp.LeaderSMS = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.LeaderSMS)
             .Select(m => new Kv { Key = m.Id, Value = m.DicDataName }).ToList();
         var opinion = await _typeCache.GetAsync($"tmp_opinion_{orderId}{_sessionContext.UserId}", HttpContext.RequestAborted);
-        if (opinion.IsNullOrEmpty())
+        if (opinion.NotNullOrEmpty())
         {
             rsp.Opinion = opinion;
         }

src/Hotline.Application.Tests/Application/DefaultCallApplicationTest.cs

@@ -0,0 +1,32 @@
+using Hotline.Api.Controllers;
+using Hotline.Application.CallCenter;
+using Hotline.Identity.Accounts;
+using Hotline.Identity.Roles;
+using Hotline.Share.Dtos.CallCenter;
+using Hotline.Users;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using SqlSugar.Extensions;
+using XF.Domain.Repository;
+
+namespace Hotline.Application.Tests.Application;
+public class DefaultCallApplicationTest
+{
+    private readonly XingTangCallApplication _defaultCallApplication;
+
+    public DefaultCallApplicationTest(XingTangCallApplication defaultCallApplication)
+    {
+        _defaultCallApplication = defaultCallApplication;
+    }
+
+    [Fact]
+    public async Task QueryCallsFixed_Test()
+    {
+        var inDto = new QueryCallsFixedDto();
+        inDto.CallStartTimeEnd = DateTime.Now;
+        inDto.CallStartTimeStart = "2024/10/01 00:00:00".ObjToDate();
+
+        var items = _defaultCallApplication.QueryCallsFixedAsync(inDto, new CancellationToken());
+        items.ShouldNotBeNull();
+    }
+}

src/Hotline.Application.Tests/Controller/OrderControllerTest.cs

@@ -10,6 +10,7 @@ using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.Users;
 using Hotline.Share.Enums.Settings;
 using Hotline.Share.Tools;
+using Hotline.Users;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Testing;
@@ -31,7 +32,7 @@ public class OrderControllerTest : TestBase
     private readonly IRepository<Hotspot> _hotspotRepository;
     private readonly IOrderRepository _orderRepository;
 
-    public OrderControllerTest(IAccountRepository accountRepository, IRepository<Role> roleRepository, UserController userController, IRepository<Hotspot> hotspotRepository, OrderController orderController, IOrderRepository orderRepository, IServiceScopeFactory scopeFactory) : base(accountRepository, roleRepository, userController, scopeFactory)
+    public OrderControllerTest(IAccountRepository accountRepository, IRepository<Role> roleRepository, UserController userController, IRepository<Hotspot> hotspotRepository, OrderController orderController, IOrderRepository orderRepository, IServiceScopeFactory scopeFactory, IRepository<User> userRepository) : base(accountRepository, roleRepository, userController, scopeFactory, userRepository)
     {
         _hotspotRepository = hotspotRepository;
         _orderController = orderController;

src/Hotline.Application.Tests/Startup.cs

@@ -149,6 +149,7 @@ public class Startup
             services.AddScoped<PushMessageController>();
             services.AddScoped<ISessionContext, DefaultHttpContextAccessor>();
             services.AddScoped<ISessionContextProvider, SessionContextProvider>();
+            services.AddScoped<ICallApplication, XingTangCallApplication>();
             //ServiceLocator.Instance = services.BuildServiceProvider();
         }
 

src/Hotline.Application/CallCenter/DefaultCallApplication.cs

@@ -398,4 +398,4 @@ public abstract class DefaultCallApplication : ICallApplication
     public abstract List<Kv> GetTelOperationOptions();
 
     #endregion
-}
+}

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

@@ -161,7 +161,7 @@ public abstract class CallReportApplicationBase : ICallReportApplication
         int connectByeTimes = _systemSettingCacheManager.ConnectByeTimes;
 
         var callData = await _callNativeRepository.Queryable()
-                .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime && p.GroupId == "1")
+                .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime && p.GroupId != "0")
                 .GroupBy(p => p.CreationTime.ToString("yyyy-MM-dd"))
                 .Select(p => new QueryCallsDetailStatistics
                 {

src/Hotline/CallCenter/Calls/CallNative.cs

@@ -72,6 +72,7 @@ namespace Hotline.CallCenter.Calls
 
         /// <summary>
         /// 结束等待时间
+        /// 兴唐没值
         /// </summary>
         [SugarColumn(ColumnDescription = "结束等待时间")]
         public DateTime? EndQueueTime { get; set; }