src/Hotline.Api/Controllers/WorkflowController.cs

@@ -287,7 +287,7 @@ public class WorkflowController : BaseController
     }
 
     /// <summary>
-    /// 查询当前流程下一节点配置
+    /// 查询当前流程下一步待选节点
     /// </summary>
     [HttpGet("{workflowId}/nextsteps")]
     public async Task<DefineWithSelectionStepsDto> GetNextStepDefine(string workflowId)
@@ -298,12 +298,13 @@ public class WorkflowController : BaseController
         return new DefineWithSelectionStepsDto
         {
             Id = workflow.DefinitionId,
-            Steps = nextStepDefines.Select(d => new KeyValuePair<string, string>(d.Code, d.Name)).ToList()
+            Steps = nextStepDefines.Select(d => new KeyValuePair<string, string>(d.Code, d.Name)).ToList(),
+            ExpiredTime = workflow.ExpiredTime
         };
     }
 
     /// <summary>
-    /// 查询当前流程下一节点配置
+    /// 查询当前流程下一节点待选配置
     /// </summary>
     [HttpGet("step-options")]
     public async Task<IReadOnlyList<KeyValuePair<string, string>>> GetNextStepOptions([FromQuery] QueryNextStepOptionDto dto)
@@ -312,8 +313,6 @@ public class WorkflowController : BaseController
         if (definition == null)
             throw new UserFriendlyException("无效DefineId");
 
-        //var workflow = await _workflowDomainService.GetWorkflowAsync(dto.WorkflowId, true, cancellationToken: HttpContext.RequestAborted);
-        //var defineStep = workflow.Definition.FindStep(dto.Code);
         var defineStep = definition.FindStep(dto.Code);
         if (defineStep is null)
             throw UserFriendlyException.SameMessage("未查询到对应节点配置");
@@ -388,7 +387,8 @@ public class WorkflowController : BaseController
         return new DefineWithSelectionStepsDto
         {
             Id = workflow.DefinitionId,
-            Steps = nextStepDefines.Select(d => new KeyValuePair<string, string>(d.Code, d.Name)).ToList()
+            Steps = nextStepDefines.Select(d => new KeyValuePair<string, string>(d.Code, d.Name)).ToList(),
+            ExpiredTime = workflow.ExpiredTime
         };
     }
 

src/Hotline.Share/Dtos/FlowEngine/DefineWithSelectionStepsDto.cs

@@ -14,5 +14,7 @@ namespace Hotline.Share.Dtos.FlowEngine
         public string Id { get; set; }
 
         public IReadOnlyList<KeyValuePair<string, string>> Steps { get; set; }
+
+        public DateTime ExpiredTime { get; set; }
     }
 }