Эх сурвалжийг харах

归档时workflow当前节点赋值为归档节点

xf 8 сар өмнө
parent
commit
c4f7413782

+ 3 - 1
src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -400,7 +400,7 @@ public partial class Workflow
     /// <summary>
     /// 流程结束
     /// </summary>
-    public void Complete(EReviewResult reviewResult = EReviewResult.Unknown)
+    public void Complete(WorkflowStep endStep, EReviewResult reviewResult = EReviewResult.Unknown)
     {
         //if (FlowType is EFlowType.Review && !reviewResult.HasValue)
         //    throw new UserFriendlyException("无审核结果");
@@ -410,6 +410,8 @@ public partial class Workflow
         if (FlowType is EFlowType.Review && ReviewResult is EReviewResult.Unknown)
             ReviewResult = reviewResult;
 
+        
+
         ClearHandlers();
 
         SetAllDuration();

+ 7 - 2
src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1459,7 +1459,12 @@ namespace Hotline.FlowEngine.Workflows
             //update endTrace
             var endTrace = await NextTraceAsync(workflow, dto, endStep, cancellationToken);
 
-            workflow.Complete(dto.ReviewResult);
+            workflow.Complete(endStep, dto.ReviewResult);
+
+            //需求调整:归档时当前节点显示为归档节点
+            workflow.UpdateCurrentStepWhenHandle(endStep,
+                current.OrgAreaCode, current.OrgAreaName, current.OrgLevel);
+            workflow.UpdateCurrentStepAcceptTime(endStep.AcceptTime.Value);
 
             await _workflowRepository.UpdateAsync(workflow, cancellationToken);
 
@@ -1468,7 +1473,7 @@ namespace Hotline.FlowEngine.Workflows
 
             return endTrace;
         }
-        
+
         ///// <summary>
         ///// 判断会签类型(中心会签或部门会签)
         ///// </summary>