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

src/Hotline.Ai.Jths/AiQualityService.cs

@@ -36,7 +36,7 @@ namespace Hotline.Ai.Jths
             if (!string.IsNullOrEmpty(fileExtension) && fileExtension.StartsWith('.'))
                 fileExtension = fileExtension.Substring(1);
             //var ywlx = !string.IsNullOrEmpty(ywlxString) ? ywlxString : model.Source.ToString();
-
+            var agentChannel = "AiAnswered".Equals(ywlxString) ? "2" : "3";
 			List <AiQualityDto> datalist = new List<AiQualityDto>();
             AiQualityDto aiQuality = new AiQualityDto
             {
@@ -47,7 +47,8 @@ namespace Hotline.Ai.Jths
                 CallTime = callStartTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? string.Empty,
                 RecordForm = fileExtension,//recordForm,
                 ywlx = ywlxString,
-            };
+                AgentChannel = agentChannel
+			};
             datalist.Add(aiQuality);
             var data = JsonConvert.SerializeObject(datalist);
             var baseUrl = new Uri(_baseUrl);

src/Hotline.Api/Controllers/CallController.cs

@@ -160,7 +160,7 @@ namespace Hotline.Api.Controllers
 			audioFile = call.RecordingAbsolutePath;
 		    fromNo = call.CPN;
 		    callStartTime = call.CreatedTime;
-		    Id = call.Id;
+		    Id = call.TransliterationId;
 			//}
 	  //      else if (_callcenterOptions.Value.CallCenterType == AppDefaults.CallCenterType.XingTang)
 	  //      {

src/Hotline.Api/Controllers/OrderController.cs

@@ -3277,8 +3277,7 @@ public class OrderController : BaseController
                 canUpdateOrderSender);
             //发送短信即将超期
             _capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
-            //写入质检
-            await _qualityApplication.AddQualityAsync(EQualitySource.Send, order.Id, HttpContext.RequestAborted);
+           
         }
         else if (dto.FlowDirection is EFlowDirection.CenterToCenter)
         {

src/Hotline.Application/Handlers/FlowEngine/WorkflowNextHandler.cs

@@ -15,10 +15,12 @@ using Hotline.Share.Dtos.Settings;
 using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Push;
+using Hotline.Share.Enums.Quality;
 using Hotline.Share.Mq;
 using Hotline.Users;
 using MapsterMapper;
 using MediatR;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using XF.Domain.Authentications;
 using XF.Domain.Entities;
@@ -226,9 +228,10 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
                         ExpiredTimeChanged = notification.ExpiredTimeChanged,
                         HandlerOrgLevel = notification.HandlerOrgId.CalcOrgLevel()
                     }, cancellationToken: cancellationToken);
+                    if (data.FlowDirection is EFlowDirection.CenterToOrg)
+	                    await _qualityApplication.AddQualityAsync(EQualitySource.Send, order.Id, cancellationToken);
 
-
-                    break;
+					break;
                 case WorkflowModuleConsts.KnowledgeAdd:
                 case WorkflowModuleConsts.KnowledgeUpdate:
                 case WorkflowModuleConsts.KnowledgeDelete:

src/Hotline.Application/Handlers/Order/OrderDelayWorkflowEndHandler.cs

@@ -1,34 +0,0 @@
-using Hotline.FlowEngine.Notifications;
-using MediatR;
-using Hotline.EventBus;
-using Microsoft.Extensions.Logging;
-
-namespace Hotline.Application.Handlers.Order
-{
-    [HandlerInject(AppScopes = EAppScope.LuZhou | EAppScope.YiBin)]
-    public class OrderDelayWorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
-    {
-        private readonly ILogger<OrderDelayWorkflowEndHandler> _logger;
-
-        public OrderDelayWorkflowEndHandler(ILogger<OrderDelayWorkflowEndHandler> logger)
-        {
-            _logger = logger;
-        }
-
-        /// <summary>Handles a notification</summary>
-        /// <param name="notification">The notification</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        public async Task Handle(EndWorkflowNotify notification, CancellationToken cancellationToken)
-        {
-            try
-            {
-                throw new NotImplementedException();
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e.Message);
-                throw;
-            }
-        }
-    }
-}

src/Hotline.Application/Quality/QualityApplication.cs

@@ -202,7 +202,6 @@ namespace Hotline.Application.Quality
 
             _logger.LogInformation($"质检对象：{System.Text.Json.JsonSerializer.Serialize(quality,
                 new JsonSerializerOptions { Encoder = JavaScriptEncoder.Create(UnicodeRanges.BasicLatin, UnicodeRanges.CjkUnifiedIdeographs) })}");
-            await _qualityRepository.AddAsync(quality, cancellationToken);
         }
 
         /// <summary>

src/Hotline/Orders/Order.cs

@@ -967,7 +967,7 @@ namespace Hotline.Orders
         /// 更新工单办理中状态
         /// </summary>
         public void UpdateHandlingStatus(bool isInCountersign) =>
-            Status = isInCountersign ? EOrderStatus.Countersigning : EOrderStatus.Handling;
+            Status = isInCountersign && Status == EOrderStatus.Handling ? EOrderStatus.Countersigning : EOrderStatus.Handling;
 
         /// <summary>
         /// 归档