工单

src/Hotline.Api/Controllers/OrderController.cs

@@ -2725,8 +2725,9 @@ public class OrderController : BaseController
                 d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
-            .WhereIF(dto.State.HasValue, d => d.State == dto.State)
-            .Where(x=>x.SendBackOrgId == _sessionContext.OrgId)
+            .WhereIF(dto.State.HasValue && dto.State < ESendBackAuditState.Audit, d => d.State == dto.State)
+            .WhereIF(dto.State.HasValue && dto.State == ESendBackAuditState.Audit, d => d.State > ESendBackAuditState.Apply)
+			.Where(x=>x.SendBackOrgId == _sessionContext.OrgId)
             .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
@@ -2978,8 +2979,8 @@ public class OrderController : BaseController
                 NextHandlers = dto.NextHandlers,
                 Opinion = dto.Cause
             };
-            if (dto.AlterTime)
-                recall.External = new External { TimeLimit = dto.TimeLimit, TimeLimitUnit = dto.TimeLimitUnit };
+            //if (dto.AlterTime)
+            //    recall.External = new External { TimeLimit = dto.TimeLimit, TimeLimitUnit = dto.TimeLimitUnit };
             //if (dto.Files.Any()) recall.Files = dto.Files;
             await _workflowApplication.RecallAsync(recall, HttpContext.RequestAborted);
             var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == dto.OrderId);
@@ -3057,8 +3058,8 @@ public class OrderController : BaseController
                 NextHandlers = dto.NextHandlers,
                 Opinion = dto.Opinion
             };
-            if (dto.AlterTime)
-                recall.External = new External { TimeLimit = dto.TimeLimit, TimeLimitUnit = dto.TimeLimitUnit };
+            //if (dto.AlterTime)
+            //    recall.External = new External { TimeLimit = dto.TimeLimit, TimeLimitUnit = dto.TimeLimitUnit };
             //if (dto.Files.Any()) recall.Files = dto.Files;
             await _workflowApplication.RecallAsync(recall, HttpContext.RequestAborted);
             var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == special.OrderId);

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

@@ -25,6 +25,12 @@ namespace Hotline.Share.Dtos.Order
 		public string NextStepCode { get; set; } = string.Empty;
 		public string NextStepName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 申请节点code(defineStep.code)
+		/// </summary>
+		public string? StepCode { get; set; }
+		public string? StepName { get; set; }
+
 		/// <summary>
 		/// 根据办理者类型不同，此字段为不同内容
 		/// <example>
@@ -136,6 +142,12 @@ namespace Hotline.Share.Dtos.Order
 		public string NextStepCode { get; set; } = string.Empty;
 		public string NextStepName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 申请节点code(defineStep.code)
+		/// </summary>
+		public string? StepCode { get; set; }
+		public string? StepName { get; set; }
+
 		public List<Kv> NextHandlers { get; set; }
 
 		/// <summary>

src/Hotline.Share/Enums/Order/ESendBackAuditState.cs

@@ -27,5 +27,11 @@ namespace Hotline.Share.Enums.Order
 		/// </summary>
 		[Description("审批拒绝")]
 		Refuse = 2,
+
+		/// <summary>
+		/// 已审批
+		/// </summary>
+		[Description("已审批")]
+		Audit = 3,
 	}
 }