退回

src/Hotline.Api/Controllers/OrderController.cs

@@ -3962,7 +3962,9 @@ public class OrderController : BaseController
             ApplyOrgName = currentStep!.AcceptorOrgName,
             SendBackOrgId = prevStep.HandlerOrgId, //prevStep.AcceptorOrgId,
             SendBackOrgName = prevStep.HandlerOrgName, //prevStep!.AcceptorOrgName,
-            WorkflowOrgId = _sessionContext.RequiredOrgId,
+            SendBackStepName = prevStep.Name,
+            WorkflowStepSendBackCrTime = currentStep.CreationTime,
+			WorkflowOrgId = _sessionContext.RequiredOrgId,
             WorkflowUserId = _sessionContext.RequiredUserId,
             WorkflowRoleIds = _sessionContext.Roles.ToList(),
             Status = order.Status,
@@ -5125,8 +5127,8 @@ public class OrderController : BaseController
         var rsp = new
         {
             SpecialTimeType = EnumExts.GetDescriptions<ETimeType>(),
-            SpecialReason = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.SpecialReason),
-            ReTransactErrorType = isInstaShot ? _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.InstaShotSpecialReason) : _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.ReTransactErrorType),
+            SpecialReason = isInstaShot ? _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.InstaShotSpecialReason) : _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.SpecialReason),
+            ReTransactErrorType =  _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.ReTransactErrorType),
             Step = step,
             Orgs = orgs,
         };

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -680,7 +680,12 @@ namespace Hotline.Share.Dtos.Order
         /// 是否退回审批中
         /// </summary>
         public bool IsReturnUnderApproval {  get; set; }
-    }
+
+        /// <summary>
+        /// 退回截至时间
+        /// </summary>
+        public DateTime? SendBackAuditEndTime { get; set; }
+	}
 
     public class UpdateOrderDto : AddOrderDto
     {

src/Hotline.Share/Dtos/Order/SendBackDto.cs

@@ -97,6 +97,26 @@ namespace Hotline.Share.Dtos.Order
 		public ESendBackAuditState State { get; set; }
 
 		public string StateText => State.GetDescription();
+		/// <summary>
+		/// 退回节点名称
+		/// </summary>
+		public string? SendBackStepName { get; set; }
+
+		/// <summary>
+		/// 退回节点创建时间
+		/// </summary>
+		public DateTime? WorkflowStepSendBackCrTime { get; set; }
+
+		/// <summary>
+		///  退回时差
+		/// </summary>
+		public double SendBackTimeDifference => GetSendBackTimeDifference();
+
+		public double GetSendBackTimeDifference() {
+			TimeSpan? timeDifference = CreationTime - WorkflowStepSendBackCrTime;
+			return Math.Round(timeDifference.Value.TotalMinutes / 60, 1);
+		}
+
 
 	}
 	public class SendBackBaseDto

src/Hotline/Orders/OrderSendBackAudit.cs

@@ -108,6 +108,18 @@ namespace Hotline.Orders
 		[SugarColumn(ColumnDescription = "退回部门名称")]
 		public string SendBackOrgName { get; set; }
 
+		/// <summary>
+		/// 退回节点名称
+		/// </summary>
+		[SugarColumn(ColumnDescription = "退回节点名称")]
+		public string? SendBackStepName { get; set; }
+
+		/// <summary>
+		/// 退回节点创建时间
+		/// </summary>
+		[SugarColumn(ColumnDescription = "退回节点创建时间")]
+		public DateTime? WorkflowStepSendBackCrTime { get; set; }
+
 		/// <summary>
 		/// 流程退回发起部门ID
 		/// </summary>