Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Ai.Jths/AiVisitService.cs

@@ -108,6 +108,17 @@ namespace Hotline.Ai.Jths
         }
 
 
+        public async Task QueryAiVisitTask(AiVisitServiceQueryRequest dto,CancellationToken cancellationToken)
+        {
+            var response = await ExecuteAsync<AiVisitServiceQueryRequest, AiVisitServiceQueryResponse>(_baseUrl + "/edas/task/status/real", Method.Get, dto, cancellationToken);
+            if (response.Result!=null)
+            {
+
+            }
+
+        }
+
+
         public async Task<ApiResponse<TResponse>> ExecuteAsync<TRequest,TResponse>(string path, Method httpMethod, TRequest request,
             CancellationToken cancellationToken)
             where TRequest : class

src/Hotline.Ai.Jths/OrderVisits/AiVisitServiceQueryRequest.cs

@@ -0,0 +1,14 @@
+
+namespace Hotline.Ai.Jths.OrderVisits
+{
+    public class AiVisitServiceQueryRequest
+    {
+        public string BatchUid { get; set; }
+
+        public string TaskUid { get; set; }
+
+        public int PageNo {get;set;}
+
+        public int PageSize { get; set; }
+    }
+}

src/Hotline.Ai.Jths/OrderVisits/AiVisitServiceQueryResponse.cs

@@ -0,0 +1,35 @@
+
+namespace Hotline.Ai.Jths.OrderVisits
+{
+    public class AiVisitServiceQueryResponse
+    {
+        public string Code { get; set; }
+
+        public string Msg { get; set; }
+
+        public PageTaskStatus Result { get; set; }
+    }
+
+    public class PageTaskStatus
+    {
+        public int PageNo { get; set; }
+
+        public int PageSize { get; set; }
+
+        public int Total { get; set; }
+
+        public int Pages { get; set; }
+
+        public object Result { get; set; }
+    }
+
+    public class TaskStatus
+    {
+        public string Uid { get; set; }
+
+        /// <summary>
+        /// 任务状态 实时(1 :待执行、2 :暂停中、3 :执行中、4 :失效、5 :呼叫失败、6：已结束（完成或取消）)
+        /// </summary>
+        public int Status { get; set; }
+    }
+}

src/Hotline.Api/Controllers/OrderController.cs

@@ -1294,9 +1294,10 @@ public class OrderController : BaseController
             .Includes(x => x.Order)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.Order.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
-            //.WhereIF(dto.IsApply == true, x => x.DelayState != EDelayState.Examining)
-            //.WhereIF(dto.IsApply == false, x => x.DelayState == EDelayState.Examining)
-            .WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
+            .WhereIF(dto.IsApply == true, x => x.DelayState != EDelayState.Examining)
+            .WhereIF(dto.IsApply == false, x => x.DelayState == EDelayState.Examining)
+            //.WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
+            //.Where(x=>x.DelayState == EDelayState.Examining)
             .OrderByDescending(x => x.ApplyDelayTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);