Dun.Jason 10 月之前
父節點
當前提交
94144e6e5c
共有 2 個文件被更改,包括 26 次插入2 次删除
  1. 23 1
      src/Hotline.Api/Controllers/AiController.cs
  2. 3 1
      src/Hotline.Share/Dtos/Ai/AiDto.cs

+ 23 - 1
src/Hotline.Api/Controllers/AiController.cs

@@ -900,12 +900,17 @@ namespace Hotline.Api.Controllers
         [HttpGet("aivisit/aivisit-list")]
         public async Task<PagedDto<AiOrderVisitDto>> AiVisitList([FromQuery]AiVisitListDto dto)
         {
-            var (total,items) = await _aiOrderVisitRepository.Queryable()
+            var (total, items) = await _aiOrderVisitRepository.Queryable()
                 .WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Name.Contains(dto.Keyword))
+                .WhereIF(dto.AiOrderVisitTaskState != null, x => x.TaskState == dto.AiOrderVisitTaskState)
+                .WhereIF(dto.StartTime.HasValue, x => x.CreationTime >= dto.StartTime)
+                .WhereIF(dto.EndTime.HasValue, x => x.CreationTime <= dto.EndTime)
                 .OrderByDescending(x => x.CreationTime)
                 .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
             return new PagedDto<AiOrderVisitDto>(total, _mapper.Map<IReadOnlyList<AiOrderVisitDto>>(items)); 
         }
+
+
         /// <summary>
         /// 智能回访明细
         /// </summary>
@@ -918,6 +923,7 @@ namespace Hotline.Api.Controllers
                 .Includes(x=>x.OrderVisit,x=>x.OrderVisitDetails)
                 .Includes(x=>x.Order)
                 .Where(x => x.AiOrderVisitId == dto.Id)
+                .WhereIF(dto.AiOrderVisitState.HasValue,x=>x.AiOrderVisitState == dto.AiOrderVisitState)
                 .WhereIF(!string.IsNullOrEmpty(dto.Keyword),x=>x.Order.No.Contains(dto.Keyword) || x.Order.Title.Contains(dto.Keyword))
                 .OrderByDescending(x => x.CreationTime)
                 .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
@@ -943,6 +949,22 @@ namespace Hotline.Api.Controllers
             return _mapper.Map<IReadOnlyList<OrderVisitDto>>(items);
         }
 
+        /// <summary>
+        /// 任务页面基础数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("aivisit/taskbase-data")]
+        public async Task<object> AiVisitTaskBaseData()
+        {
+            var rsp = new
+            {
+                AiOrderVisitTaskState = EnumExts.GetDescriptions<EAiOrderVisitTaskState>(),
+                AiOrderVisitState = EnumExts.GetDescriptions<EAiOrderVisitState>()
+            };
+            return rsp;
+        }
+
+
         /// <summary>
         /// 页面基础数据
         /// </summary>

+ 3 - 1
src/Hotline.Share/Dtos/Ai/AiDto.cs

@@ -235,12 +235,14 @@ namespace Hotline.Share.Dtos.Ai
 
     public record AiVisitListDto:PagedKeywordRequest
     {
-        
+        public EAiOrderVisitTaskState? AiOrderVisitTaskState { get; set; }
     }
 
     public record AiVisitDetailListDto:PagedKeywordRequest
     {
         public string Id { get; set; }
+
+        public EAiOrderVisitState? AiOrderVisitState { get; set; }
     }
 
     public class AiOrderVisitDto