瀏覽代碼

orderDto新增isRed

xf 6 月之前
父節點
當前提交
b7fcd22caa

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

@@ -3050,7 +3050,7 @@ public class OrderController : BaseController
             }
         }
 
-        dto.CanSign = string.IsNullOrEmpty(dto.SignerId) || !order.ActualHandleStepAcceptTime.HasValue;
+        dto.IsRed = string.IsNullOrEmpty(dto.SignerId) || !order.ActualHandleStepAcceptTime.HasValue;
 
         //var dto = _mapper.Map<OrderDto>(order!);
         //dto.CountersignId = countersignId;

+ 1 - 1
src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -15,7 +15,7 @@ public class OrderMapperConfigs : IRegister
         config.ForType<Order, OrderDto>()
             .IgnoreIf((s, d) => s.OrderExtension == null, d => d.OrderExtension)
             .IgnoreIf((s, d) => s.Hotspot == null, d => d.Hotspot)
-            .Map(d => d.CanSign, s => string.IsNullOrEmpty(s.SignerId) || !s.ActualHandleStepAcceptTime.HasValue)
+            .Map(d => d.IsRed, s => string.IsNullOrEmpty(s.SignerId) || !s.ActualHandleStepAcceptTime.HasValue)
             ;
 
         config.ForType<OrderCopy, OrderDto>()

+ 6 - 1
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -469,7 +469,12 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 是否可签收
         /// </summary>
-        public bool CanSign { get; set; }
+        public bool CanSign => string.IsNullOrEmpty(SignerId);
+
+        /// <summary>
+        /// 是否显示为红色
+        /// </summary>
+        public bool IsRed { get; set; }
 
         /// <summary>
         /// 待结束会签编号