xf 4 months ago
parent
commit
7e8eb35970

+ 6 - 0
src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -23,6 +23,12 @@ public class OrderMapperConfigs : IRegister
                                     && s.WorkflowSteps.First().Status == EWorkflowStepStatus.WaitForAccept)
                                     && s.WorkflowSteps.First().Status == EWorkflowStepStatus.WaitForAccept)
             ;
             ;
 
 
+        config.ForType<Order, OrderListOutDto>()
+            .Map(d => d.IsRed, s => s.WorkflowSteps != null
+                                    && s.WorkflowSteps.Any()
+                                    && s.WorkflowSteps.First().Status == EWorkflowStepStatus.WaitForAccept)
+            ;
+
         config.ForType<OrderCopy, OrderDto>()
         config.ForType<OrderCopy, OrderDto>()
             .Map(d => d.Id, s => s.OrderId)
             .Map(d => d.Id, s => s.OrderId)
             .Map(d => d.CopyId, s => s.Id)
             .Map(d => d.CopyId, s => s.Id)

+ 1 - 1
src/Hotline.Application/Orders/OrderApplication.cs

@@ -3195,7 +3195,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .ToArray();
             .ToArray();
 
 
         var query = _orderRepository.Queryable()
         var query = _orderRepository.Queryable()
-            .Includes(d => d.WorkflowTraces.Where(step =>
+            .Includes(d => d.WorkflowSteps.Where(step =>
                     ((step.FlowAssignType == EFlowAssignType.User && !string.IsNullOrEmpty(step.HandlerId) && step.HandlerId == _sessionContext.RequiredUserId) ||
                     ((step.FlowAssignType == EFlowAssignType.User && !string.IsNullOrEmpty(step.HandlerId) && step.HandlerId == _sessionContext.RequiredUserId) ||
                      (step.FlowAssignType == EFlowAssignType.Org && !string.IsNullOrEmpty(step.HandlerOrgId) && step.HandlerOrgId == _sessionContext.RequiredOrgId) ||
                      (step.FlowAssignType == EFlowAssignType.Org && !string.IsNullOrEmpty(step.HandlerOrgId) && step.HandlerOrgId == _sessionContext.RequiredOrgId) ||
                      (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) && _sessionContext.Roles.Contains(step.RoleId)) ||
                      (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) && _sessionContext.Roles.Contains(step.RoleId)) ||

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

@@ -1559,6 +1559,11 @@ namespace Hotline.Share.Dtos.Order
 
 
         public string IsUrgentText => IsUrgent ? "紧急" : "";
         public string IsUrgentText => IsUrgent ? "紧急" : "";
 
 
+        /// <summary>
+        /// 是否显示为红色
+        /// </summary>
+        public bool IsRed { get; set; }
+
         /// <summary>
         /// <summary>
         /// 发布范围
         /// 发布范围
         /// </summary>
         /// </summary>