src/Hotline/FlowEngine/Workflows/StepBasicEntity.cs

@@ -276,7 +276,7 @@ public abstract class StepBasicEntity : CreationEntity
         string userId, string? userName,
         string orgId, string? orgName,
         string? orgAreaCode, string? orgAreaName,
-        bool orgIsCenter, string? opinion)
+        bool orgIsCenter, string opinion)
     {
         if (!HasAccepted())
             Accept(userId, userName, orgId, orgName, orgAreaCode, orgAreaName);

src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -494,9 +494,9 @@ public partial class Workflow
     /// </summary>
     public void UpdateActualOption()
     {
-        if (FlowType is EFlowType.Review) return;
+        //if (FlowType is EFlowType.Review) return;
 
-        WorkflowStep step;
+        WorkflowStep? step;
         if (Steps.Count == 2
            && Steps.Exists(d => d.StepType == EStepType.Start)
            && Steps.Exists(d => d.StepType == EStepType.End))

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -149,7 +149,7 @@ namespace Hotline.FlowEngine.Workflows
             //    startStep, firstSteps.First());
 
             //指派实际办理节点
-            if (workflow.FlowType is EFlowType.Handle &&
+            if (/*workflow.FlowType is EFlowType.Handle &&*/
                 !workflow.IsInCountersign &&
                 firstStepDefine.StepType != EStepType.Summary &&
                 firstStepDefine.StepType != EStepType.End)
@@ -1309,7 +1309,7 @@ namespace Hotline.FlowEngine.Workflows
         /// 办理节点
         /// </summary>
         public async Task HandleStepAsync(WorkflowStep step, Workflow workflow, BasicWorkflowDto dto,
-            EFlowAssignType? flowAssignType, ECounterSignType? counterSignType, DateTime? expiredTime, 
+            EFlowAssignType? flowAssignType, ECounterSignType? counterSignType, DateTime? expiredTime,
             CancellationToken cancellationToken)
         {
             if (step.Status is EWorkflowStepStatus.Handled)
@@ -1335,7 +1335,7 @@ namespace Hotline.FlowEngine.Workflows
             _mapper.Map(dto, step);
 
             //step办理状态
-            HandleStep(step, dto.NextStepCode);
+            HandleStep(step, dto.Opinion, dto.NextStepCode);
         }
 
         private bool CheckIsActualHandle(Workflow workflow, WorkflowStep step, StepDefine nextStepDefine,
@@ -1358,12 +1358,12 @@ namespace Hotline.FlowEngine.Workflows
         /// <summary>
         /// 办理节点(赋值节点的办理对象信息)
         /// </summary>
-        private void HandleStep(WorkflowStep step, string nextStepCode)
+        private void HandleStep(WorkflowStep step, string opinion, string nextStepCode)
         {
             step.Handle(_sessionContext.RequiredUserId, _sessionContext.UserName,
                 _sessionContext.RequiredOrgId, _sessionContext.OrgName,
                 _sessionContext.OrgAreaCode, _sessionContext.OrgAreaName,
-                _sessionContext.OrgIsCenter, nextStepCode);
+                _sessionContext.OrgIsCenter, opinion, nextStepCode);
         }
 
 
@@ -1520,7 +1520,7 @@ namespace Hotline.FlowEngine.Workflows
             await _workflowTraceRepository.UpdateRangeAsync(uncompleteTraces, cancellationToken);
         }
 
-        private void HandleTrace(WorkflowTrace trace, string? opinion)
+        private void HandleTrace(WorkflowTrace trace, string opinion)
         {
             trace.Handle(
                 _sessionContext.RequiredUserId, _sessionContext.UserName,
@@ -1725,7 +1725,7 @@ namespace Hotline.FlowEngine.Workflows
             //    _sessionContext.RequiredOrgId, _sessionContext.OrgName,
             //    _sessionContext.OrgAreaCode, _sessionContext.OrgAreaName);
 
-            HandleStep(step, string.Empty);
+            HandleStep(step, "流程归档", string.Empty);
 
             await _workflowStepRepository.AddAsync(step, cancellationToken);
 
@@ -1959,11 +1959,11 @@ namespace Hotline.FlowEngine.Workflows
             if (step.IsStartCountersign)
             {
                 var countersignSteps = steps.Where(d => d.CountersignId == step.StartCountersignId).ToList();
-                if(countersignSteps.Any())
+                if (countersignSteps.Any())
                 {
                     foreach (var countersignStep in countersignSteps)
                     {
-                        HandleStepsByTerminalCs(countersignStep,steps,traces,ref updateSteps, ref updateTraces);
+                        HandleStepsByTerminalCs(countersignStep, steps, traces, ref updateSteps, ref updateTraces);
                     }
                 }
             }
@@ -1986,8 +1986,7 @@ namespace Hotline.FlowEngine.Workflows
                 step.Handle(_sessionContext.RequiredUserId, _sessionContext.UserName,
                     _sessionContext.RequiredOrgId, _sessionContext.OrgName,
                     _sessionContext.OrgAreaCode, _sessionContext.OrgAreaName,
-                    _sessionContext.OrgIsCenter, null);
-                step.Opinion = opinion;
+                    _sessionContext.OrgIsCenter, opinion);
             }
             updateSteps.Add(step);
 

src/Hotline/FlowEngine/Workflows/WorkflowStep.cs

@@ -123,9 +123,9 @@ public class WorkflowStep : StepBasicEntity
         string userId, string? userName,
         string orgId, string? orgName,
         string? orgAreaCode, string? orgAreaName,
-        bool orgIsCenter, string nextStepCode)
+        bool orgIsCenter, string opinion, string nextStepCode)
     {
-        base.Handle(userId, userName, orgId, orgName, orgAreaCode, orgAreaName, orgIsCenter, null);
+        base.Handle(userId, userName, orgId, orgName, orgAreaCode, orgAreaName, orgIsCenter, opinion);
         Status = EWorkflowStepStatus.Handled;
 
         if (!IsInCountersign()