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

src/Hotline.Api/Controllers/OrderController.cs

@@ -1387,12 +1387,20 @@ public class OrderController : BaseController
     [HttpGet("mayscreen")]
     public async Task<PagedDto<OrderVisitDetailDto>> MayScreenList([FromQuery] MayScreenListDto dto)
     {
+        dto.CreationTimeEnd = DateTime.Now;
+        dto.CreationTimeStart = DateTime.Now;
+        if (dto.IsHomePage!=null && dto.IsHomePage==true)
+        {
+            dto.CreationTimeStart = _timeLimitDomainService.CalcWorkTimeReduce(DateTime.Now, 5);
+        }
+
         var query = _orderVisitedDetailRepository.Queryable(false, true)
             .Includes(x => x.OrderVisit)
             .Includes(x => x.OrderVisit, y => y.Order)
             .Includes(x => x.OrderVisit, y => y.Employee)
             .LeftJoin<OrderScreen>((x, s) => x.Id == s.VisitDetailId && (int)s.Status < 2 && s.IsDeleted == false)
             .Where((x, s) => s.Id == null)
+            .WhereIF(dto.IsHomePage.HasValue && dto.IsHomePage==true ,x=>x.OrderVisit.VisitTime< dto.CreationTimeEnd && x.OrderVisit.VisitTime> dto.CreationTimeStart)
             .Where((x, s) => x.OrderVisit.VisitState != EVisitState.None && x.OrderVisit.IsCanHandle);
         if (_sessionContext.OrgId != null && !_sessionContext.OrgIsCenter)
         {

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

@@ -515,6 +515,8 @@ namespace Hotline.Share.Dtos.Order
 
 	    public DateTime? CreationTimeStart { get; set; }
 	    public DateTime? CreationTimeEnd { get; set; }
+
+        public bool? IsHomePage { get; set; }
     }
 
 	public record UrgeListDto : PagedKeywordRequest