瀏覽代碼

fixed: 分页查询工单列表,增加延期申请数量字段

xf 1 年之前
父節點
當前提交
60dcf463ea
共有 2 個文件被更改,包括 10 次插入4 次删除
  1. 1 0
      src/Hotline.Api/Controllers/OrderController.cs
  2. 9 4
      src/Hotline.Share/Dtos/Order/OrderDto.cs

+ 1 - 0
src/Hotline.Api/Controllers/OrderController.cs

@@ -1723,6 +1723,7 @@ public class OrderController : BaseController
     public async Task<PagedDto<OrderDto>> Query([FromQuery] QueryOrderDto dto)
     {
         var (total, items) = await _orderRepository.Queryable(workflowFilter: false)
+            .Includes(d=>d.OrderDelays)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
             .WhereIF(!string.IsNullOrEmpty(dto.Content), d => d.Content.Contains(dto.Content!))

+ 9 - 4
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -362,10 +362,10 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string EmergencyLevelText => EmergencyLevel.GetDescription();
 
-        /// <summary>
-        /// 超期时间描述(需求:超期3天、0.5天后超期)
-        /// </summary>
-        public string ExpiredText => CalculateExpiredText();
+        ///// <summary>
+        ///// 超期时间描述(需求:超期3天、0.5天后超期)
+        ///// </summary>
+        //public string ExpiredText => CalculateExpiredText();
 
         /// <summary>
         /// 是否可编辑
@@ -378,6 +378,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public bool CanSign => string.IsNullOrEmpty(SignerId);
 
+        /// <summary>
+        /// 延期申请数量
+        /// </summary>
+        public int DelayingCount => OrderDelays.Count;
+        
         private string CalculateExpiredText()
         {
             //todo 完整处理方案:1.创建待过期表,Id,过期时间,即将过期时间等字段。2.延迟消息通知处理过期,删除子表数据,处理order过期状态字段。3.此处即可采用expiredStatus进行判断