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

src/Hotline.Api/Controllers/IPPbxController.cs

@@ -39,6 +39,7 @@ using Hotline.FlowEngine.Notifications;
 using Hotline.Quality.Notifications;
 using Hotline.Share.Dtos.Quality;
 using MongoDB.Driver;
+using Hotline.Repository.SqlSugar.CallCenter;
 
 namespace Hotline.Api.Controllers
 {
@@ -66,6 +67,7 @@ namespace Hotline.Api.Controllers
         private readonly ISystemSettingCacheManager _systemSettingCacheManager;
         private readonly IRepository<TelActionRecord> _telActionRecordRepository;
         private readonly ISystemMobilAreaApplication _systemMobilAreaApplication;
+        private readonly IRepository<Work> _workRepository;
         private readonly Publisher _publisher;
 
 		public IPPbxController(ITrClient trClient, IMapper mapper, IUserDomainService userDomainService,
@@ -78,7 +80,7 @@ namespace Hotline.Api.Controllers
             ITelApplication telApplication, IRepository<Quality.Quality> qualiteyRepository,
             IAiQualityService aiQualityService, IRepository<QualityTemplate> qualityTemplate, 
             ISystemSettingCacheManager systemSettingCacheManager,IRepository<TelActionRecord> telActionRecordRepository,
-            ISystemMobilAreaApplication systemMobilAreaApplication, Publisher publisher)
+            ISystemMobilAreaApplication systemMobilAreaApplication,IRepository<Work> workRepository ,Publisher publisher)
         {
             _trClient = trClient;
             _mapper = mapper;
@@ -102,6 +104,7 @@ namespace Hotline.Api.Controllers
             _systemSettingCacheManager = systemSettingCacheManager;
             _telActionRecordRepository = telActionRecordRepository;
             _systemMobilAreaApplication = systemMobilAreaApplication;
+            _workRepository = workRepository;
             _publisher = publisher;
 
 		}
@@ -136,7 +139,8 @@ namespace Hotline.Api.Controllers
         public async Task<IReadOnlyList<TrTelStateDto>> TrQueryTelState([FromQuery] string? state)
         {
             var tels = await _trClient.QueryTelStateAsync(new QueryTelStateRequest() { State = state }, HttpContext.RequestAborted);
-            var workList = _userCacheManager.GetWorks();
+            //var workList = _userCacheManager.GetWorks();
+            var workList = await _workRepository.Queryable().Where(d=> 1 == 1 && !d.EndTime.HasValue).ToListAsync();
             var query = from tel in tels.AgentList
                         join works in workList on tel.TelNo equals works.TelNo into workD
                         from work in workD.DefaultIfEmpty()

src/Hotline.Application/CallCenter/DefaultCallApplication.cs

@@ -204,7 +204,7 @@ public abstract class DefaultCallApplication : ICallApplication
     public virtual async Task<IReadOnlyList<CallNativeDto>> QueryCallsFixedAsync(QueryCallsFixedDto dto, CancellationToken cancellationToken)
     {
         return await _callNativeRepository.Queryable(includeDeleted: true)
-            .LeftJoin<Order>((d, o) => d.CallNo == o.CallId)
+            .LeftJoin<Order>((d, o) => d.Id == o.CallId)
             .WhereIF(!string.IsNullOrEmpty(dto.OrderNo), (d, o) => o.No == dto.OrderNo)
             .WhereIF(!string.IsNullOrEmpty(dto.FromNo), d => d.FromNo == dto.FromNo)
             .WhereIF(!string.IsNullOrEmpty(dto.ToNo), d => d.ToNo == dto.ToNo)

src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -96,7 +96,8 @@ public class OrderMapperConfigs : IRegister
 
         config.ForType<UpdateOrderDto, Order>()
             .Inherits<AddOrderDto, Order>()
-            .Map(d => d.OrderExtension.Id, x => x.Id);
+            .Map(d => d.OrderExtension.Id, x => x.Id)
+            .Ignore(d => d.ProvinceNo);
 
         config.ForType<Workflow, Order>()
             .Map(d => d.WorkflowId, s => s.Id)

src/Hotline/Orders/OrderDomainService.cs

@@ -19,6 +19,7 @@ using Hotline.Share.Dtos;
 using Hotline.Settings.Hotspots;
 using Hotline.Share.Dtos.FlowEngine;
 using Microsoft.AspNetCore.Http;
+using Hotline.Settings;
 
 namespace Hotline.Orders;
 
@@ -112,8 +113,8 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
         order.Init();
         order.No = GenerateNewOrderNo();
         order.Password = Random.Shared.Next(100000, 1000000).ToString();
-        order.ProvinceNo ??= GenerateNewProvinceNo(order.No, order.SourceChannelCode);
-        return await _orderRepository.AddOrderNavAsync(order, cancellationToken);
+		order.ProvinceNo = string.IsNullOrEmpty(order.ProvinceNo) ? GenerateNewProvinceNo(order.No, order.SourceChannelCode) : order.ProvinceNo;
+		return await _orderRepository.AddOrderNavAsync(order, cancellationToken);
     }
 
     /// <summary>
@@ -440,17 +441,19 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
         //成员单位标识  99
         //宜宾市 511500  市级
         var today = DateTime.Today;
-        //var count = no.Substring(no.Length - 5);
+		//var count = no.Substring(no.Length - 5);
+		var setting = _systemSettingCacheManager.GetSetting(SettingConstants.VersionsAreaCode);
+        var versionsAreaCode = setting?.SettingValue[0];
 
-        //todo 双系统并行暂时执行此方案
-        var count = no.Substring(no.Length - 4);
+		//todo 双系统并行暂时执行此方案
+		var count = no.Substring(no.Length - 4);
         count = (Convert.ToInt32(count) + 50000).ToString();
 
         var provinceCodes = new[] { "RGDH", "WX", "WB", "AP", "WZ", "YJ", "SCZWFWW", "XCX", "QT" };
         var prefix = provinceCodes.Any(d => d.Equals(sourceChannelCode))
             ? sourceChannelCode
             : "QT";
-        return $"{prefix}99511500{today:yyMMdd}{count}";
+        return $"{prefix}99{versionsAreaCode}{today:yyMMdd}{count}";
     }
 
 

src/Hotline/Settings/SettingConstants.cs

@@ -379,5 +379,10 @@ namespace Hotline.Settings
         /// 是否开启应急管理局推送业务
         /// </summary>
         public const string IsOpenContingencyManagement = "IsOpenContingencyManagement";
-    }
+
+		/// <summary>
+		/// 系统版本地区
+		/// </summary>
+		public const string VersionsAreaCode = "VersionsAreaCode";
+	}
 }