Dun.Jason před 1 rokem
rodič
revize
830ebfa9f0

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

@@ -2081,7 +2081,9 @@ public class OrderController : BaseController
 
         var dto = _mapper.Map<OrderDto>(order!);
         dto.CanEndCountersign = canEndCs;
-
+        dto.IsCanDelay = !order.OrderDelays.Any(x => x.DelayState == EDelayState.Examining);
+        var delayModel = order.OrderDelays.Where(x=>x.DelayState == EDelayState.Pass).OrderByDescending(x => x.CreationTime).FirstOrDefault();
+        dto.DelayString = delayModel!=null ? delayModel?.DelayNum + "个" + delayModel?.DelayUnit.GetDescription() :"";
         if (dto.FileJson != null && dto.FileJson.Any())
         {
             var ids = order.FileJson.Select(x => x.Id).ToList();

+ 10 - 0
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -395,6 +395,16 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public bool CanEndCountersign { get; set; }
 
+        /// <summary>
+        /// 是否可以延期
+        /// </summary>
+        public bool IsCanDelay { get; set; }
+
+        /// <summary>
+        /// 最后一次延期天数
+        /// </summary>
+        public string? DelayString { get; set; }
+
         /// <summary>
         /// 是否可退回
         /// </summary>