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

src/Hotline.Api/Controllers/AiController.cs

@@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using XF.Domain.Authentications;
 using XF.Domain.Constants;
 using XF.Domain.Repository;
 
@@ -212,8 +213,16 @@ namespace Hotline.Api.Controllers
                                 ClientGuid = ""
                             }, cancellationToken: HttpContext.RequestAborted);
 
-
-
+                            //推门户
+                            await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderVisitedWeb, new PublishVisitAllDto()
+                            {
+                                Id = aiOrderVisitDetail.OrderVisit.Id,
+                                Order = orderDto,
+                                OrderVisitDetails = _mapper.Map<List<VisitDetailDto>>(aiOrderVisitDetail.OrderVisit.OrderVisitDetails),
+                                VisitTime = aiOrderVisitDetail.OrderVisit.VisitTime,
+                                VisitType = aiOrderVisitDetail.OrderVisit.VisitType,
+                                PublishTime = aiOrderVisitDetail.OrderVisit.PublishTime,
+                            }, cancellationToken: HttpContext.RequestAborted);
                         }
                         else
                         {

src/Hotline.Api/Controllers/OrderController.cs

@@ -222,7 +222,7 @@ public class OrderController : BaseController
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
             .WhereIF(dto.FiledTimeStart.HasValue, d => d.OrderPublish.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.FiledTimeEnd.HasValue, d => d.OrderPublish.CreationTime <= dto.CreationTimeEnd)
-            .OrderBy(d => d.CreationTime)
+            .OrderByDescending(d => d.FiledTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
         return new PagedDto<PublishDto>(total, _mapper.Map<IReadOnlyList<PublishDto>>(items));
@@ -562,7 +562,7 @@ public class OrderController : BaseController
                 x => x.VisitState == Share.Enums.Order.EVisitState.Visited)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 x => x.Order.Title.Contains(dto.Keyword!) || x.Order.No.Contains(dto.Keyword!))
-            .OrderBy(x => x.CreationTime)
+            .OrderByDescending(x => x.PublishTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderVisitDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDto>>(items));
     }
@@ -1191,7 +1191,7 @@ public class OrderController : BaseController
             .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)
-            .OrderByDescending(x => x.CreationTime)
+            .OrderByDescending(x => x.ApplyDelayTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
         return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
@@ -2291,7 +2291,7 @@ public class OrderController : BaseController
             .WhereIF(dto.IsHandled.HasValue, d => d.Workflow.Steps.Any(x => handleStatuses.Contains(x.Status)))
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))
-            .OrderByDescending(d => d.ExpiredTime)
+            .OrderByDescending(d => d.StartTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 
 
@@ -2317,7 +2317,9 @@ public class OrderController : BaseController
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.No.Contains(dto.Keyword!) || d.Title.Contains(dto.Keyword!))
             .Where(d => string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContext.RequiredUserId)
-            .OrderByDescending(d => d.ExpiredTime)
+            .OrderBy(d=>d.Status)
+            .OrderByIF(dto.IsHandled == true,d=>d.StartTime,OrderByType.Asc)
+            .OrderByIF(dto.IsHandled == false,d=> d.CreationTime,OrderByType.Desc)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 
         return new PagedDto<OrderDto>(total, _mapper.Map<IReadOnlyList<OrderDto>>(items));

src/Hotline.Share/Dtos/Order/OrderVisitDto.cs

@@ -415,6 +415,11 @@ namespace Hotline.Share.Dtos.Order
         public DateTime? VisitTime { get; set; }
 
 
+        /// <summary>
+        /// 回访状态
+        /// </summary>
+        public EVisitState VisitState { get; set; }
+
         /// <summary>
         /// 回访明细
         /// </summary>