即将

src/Hotline.Repository.SqlSugar/Orders/OrderRepository.cs

@@ -112,30 +112,6 @@ namespace Hotline.Repository.SqlSugar.Orders
             await Db.Deleteable(orderReport).ExecuteCommandAsync();
         }
 
-        /// <summary>
-        /// 即将超期列表
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <param name="AboutToExpireNum"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        public async Task<List<AboutToExpireDto>> GetAboutToExpireAsync(AboutToExpireListDto dto,int AboutToExpireNum, CancellationToken cancellationToken)
-        {
-            DateTime stTime = _timeLimitDomainService.WorkDay(DateTime.Now);
-            var oders = await Db.Queryable<Order>()
-                .WhereIF(dto.IsProvince.HasValue, x => x.IsProvince == dto.IsProvince)
-                .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.No == dto.No)
-                .WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Title.Contains(dto.Title!))
-                .Where(x=> x.ExpiredTime != null && stTime <= x.ExpiredTime.Value)
-                .Where(x => x.ExpiredTime != null && (x.ExpiredTime.Value - stTime).TotalHours <= AboutToExpireNum)
-                .Where(x=>x.Status== EOrderStatus.Handling || x.Status == EOrderStatus.Countersigning)
-                .Select(x => new AboutToExpireDto()
-                {
-                    IntervalText = _timeLimitDomainService.CalcTimeInterval(stTime, x.ExpiredTime!.Value, false)
-                }, true).ToListAsync();
-            return oders;
-        }
-
 		/// <summary>
 		/// 即将超期列表
 		/// </summary>
@@ -152,11 +128,8 @@ namespace Hotline.Repository.SqlSugar.Orders
 			var (total, items) = await Db.Queryable<Order>()
 				.WhereIF(dto.IsProvince.HasValue, x => x.IsProvince == dto.IsProvince)
 				.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Title.Contains(dto.Keyword!) || x.No.Contains(dto.Keyword!))
-				//.WhereIF(!string.IsNullOrEmpty(dto.No), x => x.No == dto.No)
-				//.WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Title.Contains(dto.Title!))
 				.Where(x => x.ExpiredTime != null &&
-				(((x.Status == EOrderStatus.Filed || x.Status == EOrderStatus.Published || x.Status == EOrderStatus.Visited) && x.FiledTime > x.ExpiredTime) ||
-				((x.Status != EOrderStatus.Filed && x.Status != EOrderStatus.Published && x.Status != EOrderStatus.Visited) && stTime > x.ExpiredTime.Value)))
+				x.Status != EOrderStatus.Filed && x.Status != EOrderStatus.Published && x.Status != EOrderStatus.Visited && stTime > x.ExpiredTime.Value)
 				.OrderByDescending(x => x.CreationTime)
 				.ToPagedListAsync(dto.PageIndex, dto.PageSize, cancellationToken);
 			return new PagedDto<OrderDto>(total, _mapper.Map<IReadOnlyList<OrderDto>>(items));
@@ -181,7 +154,7 @@ namespace Hotline.Repository.SqlSugar.Orders
 				.Where(x => x.ModuleCode == "OrderHandle")
 				.WhereIF(dto.IsProvince.HasValue, (x, o) => o.IsProvince == dto.IsProvince)
 				.WhereIF(!string.IsNullOrEmpty(dto.Keyword), (x, o) => o.Title.Contains(dto.Keyword!) || o.No.Contains(dto.Keyword!))
-				.Where((x, o) => (((int)x.Status >= 20 && x.EndTime > x.ExpiredTime) || ((int)x.Status < 20 && stTime > x.ExpiredTime)))
+				.Where((x, o) => ((int)x.Status < 20 && stTime > x.ExpiredTime))
 				.Select((x, o) => new WorkflowOrder { Order = o }, true)
 				.OrderByDescending(x => x.CreationTime)
 				.ToPageListAsync(dto.PageIndex, dto.PageSize, total, cancellationToken);