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

src/Hotline.Application/CallCenter/DefaultCallApplication.cs

@@ -295,6 +295,20 @@ public abstract class DefaultCallApplication : ICallApplication
                 IsOrder = !SqlFunc.IsNullOrEmpty(o.Id),
             }, true);
         }
+        if (dto.Type == 3)
+        {
+            return query.Select((d, o, v) => new CallNativeDto
+            {
+                OrderId = o.Id,
+                OrderNo = o.No,
+                CallState = d.CallState,
+                Title = o.Title,
+                IsVisit = !SqlFunc.IsNullOrEmpty(v.Id),
+                IsOrder = !SqlFunc.IsNullOrEmpty(o.Id),
+                StaffNo = SqlFunc.Subqueryable<CallNative>().Where(s => s.CallNo == d.CallNo && SqlFunc.IsNullOrEmpty(s.CallNo) == false).Select(s => s.StaffNo),
+                TelNo = SqlFunc.Subqueryable<CallNative>().Where(s => s.CallNo == d.TelNo && SqlFunc.IsNullOrEmpty(s.TelNo) == false).Select(s => s.TelNo),
+            }, true);
+        }
         return query.Select((d, o, v) => new CallNativeDto
         {
             OrderId = o.Id,
@@ -486,7 +500,7 @@ public abstract class DefaultCallApplication : ICallApplication
                 dto.CallId = callRemark.CallId;
             }
             catch (Exception e)
-            { 
+            {
                 _logger.LogError($"PublishVisitRelevanceCallIdAsync: {e.ToJson()}");
             }
         }
@@ -566,13 +580,13 @@ public abstract class DefaultCallApplication : ICallApplication
             .Where((o, c) => o.Id == orderId)
             .Select((o, c) => new { o.CallId, c.CallNo })
             .FirstAsync(cancellationToken);
-//#if DEBUG
-//        var order = await _orderRepository.GetAsync(orderId);
-//        var oldName = _sessionContext.UserName;
-//        _sessionContext.ChangeSession("08dcfe32-c260-40b4-839a-aeca1f76244c");
-//        var newName = _sessionContext.UserName;
+        //#if DEBUG
+        //        var order = await _orderRepository.GetAsync(orderId);
+        //        var oldName = _sessionContext.UserName;
+        //        _sessionContext.ChangeSession("08dcfe32-c260-40b4-839a-aeca1f76244c");
+        //        var newName = _sessionContext.UserName;
 
-//#endif
+        //#endif
         if (orderCall is null || orderCall.CallNo.IsNullOrEmpty())
         {
             string message = $"延迟更新工单通话, 工单: {orderId} 根据 order.id left join call_native 信息为空; 消息队列无须重试";