Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -425,6 +425,19 @@ namespace Hotline.FlowEngine.Workflows
 
             await _workflowTraceRepository.UpdateRangeAsync(updateTraces, cancellationToken);
 
+            if (workflow.ActualHandleStepId == currentStep.Id)
+            {
+                //更新实际办理节点信息
+                workflow.UpdateActualStepWhenHandle(currentStep, _sessionContextProvider.SessionContext.OrgAreaCode,
+                    _sessionContextProvider.SessionContext.OrgAreaName, _sessionContextProvider.SessionContext.OrgLevel);
+            }
+
+            if (workflow.CurrentStepId == currentStep.Id)
+            {
+                workflow.UpdateCurrentStepWhenHandle(currentStep, _sessionContextProvider.SessionContext.OrgAreaCode,
+                    _sessionContextProvider.SessionContext.OrgAreaName, _sessionContextProvider.SessionContext.OrgLevel);
+            }
+            
             //var trace = await NextTraceAsync(workflow, dto, currentStep, cancellationToken);
 
             #endregion
@@ -450,6 +463,7 @@ namespace Hotline.FlowEngine.Workflows
                     workflow.UpdateActualStepWhenHandle(currentStep, _sessionContextProvider.SessionContext.OrgAreaCode,
                         _sessionContextProvider.SessionContext.OrgAreaName, _sessionContextProvider.SessionContext.OrgLevel);
                     workflow.ActualHandleStepAcceptTime = currentStep.AcceptTime;
+                    workflow.ActualHandleTime = currentStep.HandleTime;
                 }
 
                 var endTrace = await EndAsync(current, workflow, dto, nextStepDefine, currentStep, expiredTime, cancellationToken);
@@ -2098,8 +2112,7 @@ namespace Hotline.FlowEngine.Workflows
                 var nextHandler = dto.NextHandlers.First();
                 workflow.UpdateActualStepWhenAssign(nextStep, nextHandler);
             }
-
-
+            
             //与实际办理节点的接办状态保持一致
             workflow.ActualHandleStepAcceptTime = nextStep.AcceptTime;
         }