|
@@ -260,9 +260,9 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
if (workflow.CanHandle(userId, orgId))
|
|
|
{
|
|
|
var currentStep = FindCurrentStepWaitForHandle(workflow, userId, orgId);
|
|
|
- if(currentStep.Status is not EWorkflowStepStatus.Handled)
|
|
|
+ if (currentStep.Status is not EWorkflowStepStatus.Handled)
|
|
|
{
|
|
|
- canPrevious = !(currentStep.IsInCountersign() &&
|
|
|
+ canPrevious = !(currentStep.IsInCountersign() &&
|
|
|
!currentStep.IsTopCountersignEndStep(workflow.TopCountersignStepId));
|
|
|
}
|
|
|
}
|
|
@@ -467,9 +467,16 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
////if (isCenterToOrg)
|
|
|
//// workflow.CenterToOrg(CalculateExpiredTime(workflow.WorkflowDefinition.Code));//todo 过期时间
|
|
|
|
|
|
+ //todo 如果是工单办理类型 并且参数传入期满时间有值, 将值赋予workflow
|
|
|
+ //if (workflow.FlowType is EFlowType.Handle && )
|
|
|
+ //{
|
|
|
+ // workflow.NearlyExpiredTime =
|
|
|
+ //workflow.ExpiredTime =
|
|
|
+ //}
|
|
|
+
|
|
|
//创建下一/N个节点(会签汇总节点:会签未全部办理时不创建,最后一个会签办理节点创建会签汇总节点)
|
|
|
var nextSteps = await CreateNextStepsAsync(workflow, currentStep, dto, nextStepDefine, isNextDynamic,
|
|
|
- flowAssignInfo, cancellationToken);
|
|
|
+ flowAssignInfo, cancellationToken);
|
|
|
|
|
|
//赋值当前节点的下级办理节点
|
|
|
if (dto.IsStartCountersign
|
|
@@ -640,7 +647,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
|
|
|
//更新实际办理节点信息
|
|
|
workflow.UpdateActualStepWhenAssign(newPrevStep, prevStep.HandlerOrgName, prevStep.HandlerOrgId);
|
|
|
-
|
|
|
+
|
|
|
//更新流程可办理对象
|
|
|
workflow.UpdatePreviousHandlers(operater.Id, operater.OrgId, prevStep);
|
|
|
|