xf 1 năm trước cách đây
mục cha
commit
36712ccb61

+ 4 - 4
src/Hotline.Api/Controllers/OrderController.cs

@@ -2139,7 +2139,7 @@ public class OrderController : BaseController
     /// 查询待办工单
     /// </summary>
     [HttpGet("waited")]
-    public async Task<PagedDto<OrderWaitedDto>> QueryWaited([FromQuery] QueryOrderWaitedDto dto)
+    public async Task<PagedDto<OrderDto>> QueryWaited([FromQuery] QueryOrderWaitedDto dto)
     {
         EWorkflowStepStatus[] handleStatuses = Array.Empty<EWorkflowStepStatus>();
         if (dto.IsHandled.HasValue)
@@ -2158,16 +2158,16 @@ public class OrderController : BaseController
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 (s, w, o) => o.No.Contains(dto.Keyword) || o.Title.Contains(dto.Keyword))
             .OrderByDescending((s) => s.StepExpiredTime)
-            .Select((s, w, o) => new OrderWaitedDto
+            .Select((s, w, o) => new OrderDto
             {
                 Id = o.Id,
                 ExpiredTime = o.ExpiredTime,
-                StepExpiredTime = s.StepExpiredTime,
+                //StepExpiredTime = s.StepExpiredTime,
                 Status = o.Status
             }, true)
             .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
 
-        return new PagedDto<OrderWaitedDto>(total, dtos);
+        return new PagedDto<OrderDto>(total, dtos);
     }
 
     /// <summary>

+ 1 - 0
src/Hotline/Orders/Order.cs

@@ -370,6 +370,7 @@ namespace Hotline.Orders
         /// <summary>
         /// 实际办理意见(办理中...or 最终办理意见)
         /// </summary>
+        [SugarColumn(Length = 2000)]
         public string ActualOpinion { get; set; } = "办理中...";
 
         /// <summary>