xf 9 сар өмнө
parent
commit
9ad8b24c12

+ 38 - 34
src/Hotline.Api/Controllers/TestController.cs

@@ -185,7 +185,7 @@ IRepository<EnforcementOrders> enforcementOrdersRepository,
 IRepository<JudicialManagementOrders> judicialManagementOrdersRepository,
 IRepository<EnforcementOrdersHandler> enforcementOrdersHandlerRepository,
         IWorkflowApplication workflowApplication
-		)
+        )
     {
         _logger = logger;
         _authorizeGenerator = authorizeGenerator;
@@ -229,7 +229,7 @@ IRepository<EnforcementOrdersHandler> enforcementOrdersHandlerRepository,
         _enforcementOrdersHandlerRepository = enforcementOrdersHandlerRepository;
         _workflowApplication = workflowApplication;
 
-	}
+    }
     /// <summary>
     /// 处理司法工单数据
     /// </summary>
@@ -1018,7 +1018,8 @@ IRepository<EnforcementOrdersHandler> enforcementOrdersHandlerRepository,
     /// <returns></returns>
     [HttpGet("oders_workflow_step")]
     [AllowAnonymous]
-    public async Task AddJudicialManagementOrders() {
+    public async Task AddJudicialManagementOrders()
+    {
 
         var steps = await _workflowStepRepository.Queryable()
             .LeftJoin<Order>((ws, d) => ws.ExternalId == d.Id)
@@ -1028,13 +1029,13 @@ IRepository<EnforcementOrdersHandler> enforcementOrdersHandlerRepository,
         _logger.LogInformation($"取到数据 {steps.Count} 条");
         foreach (var item in steps)
         {
-			///组装数据
-			//Workflow workflow
-			Workflow workflow = await _workflowDomainService.GetWorkflowAsync(item.WorkflowId, withDefine: true, withSteps: true,
-				cancellationToken: HttpContext.RequestAborted);
+            ///组装数据
+            //Workflow workflow
+            Workflow workflow = await _workflowDomainService.GetWorkflowAsync(item.WorkflowId, withDefine: true, withSteps: true,
+                cancellationToken: HttpContext.RequestAborted);
             //WorkflowStep startStep
-            var startStep = workflow.Steps.FirstOrDefault(x=>x.StepType  == EStepType.Start);
-            if(startStep is null) continue;
+            var startStep = workflow.Steps.FirstOrDefault(x => x.StepType == EStepType.Start);
+            if (startStep is null) continue;
             //BasicWorkflowDto dto
             BasicWorkflowDto dto = new BasicWorkflowDto
             {
@@ -1064,47 +1065,50 @@ IRepository<EnforcementOrdersHandler> enforcementOrdersHandlerRepository,
             //ISessionContext current
             ISessionContext current = new ProvinceSessionContext
             {
-	            UserId = startStep.HandlerId,
+                UserId = startStep.HandlerId,
                 UserName = startStep.HandlerName,
-                OrgId  = startStep.HandlerOrgId,
+                OrgId = startStep.HandlerOrgId,
                 OrgName = startStep.HandlerOrgName,
                 OrgAreaCode = startStep.HandlerOrgAreaCode,
                 OrgAreaName = startStep.HandlerOrgAreaName,
                 OrgLevel = 1
-			};
+            };
 
-			//StepDefine firstStepDefine
-			StepDefine firstStepDefine = workflow.WorkflowDefinition.FindStepDefine(startStep.NextStepCode);
-			//FlowAssignInfo flowAssignInfo
-			////如果发起会签需检查是否支持发起会签
-			//var startStepDefine = workflow.WorkflowDefinition.FindStartStepDefine();
+            //StepDefine firstStepDefine
+            StepDefine firstStepDefine = workflow.WorkflowDefinition.FindStepDefine(startStep.NextStepCode);
+            //FlowAssignInfo flowAssignInfo
+            ////如果发起会签需检查是否支持发起会签
+            //var startStepDefine = workflow.WorkflowDefinition.FindStartStepDefine();
 
-			//下一节点是否为动态节点
+            //下一节点是否为动态节点
             var isNextDynamic = false;
 
-			FlowAssignInfo flowAssignInfo =
-				await _workflowApplication.GetNextStepFlowAssignInfoAsync(workflow, startStep, dto, firstStepDefine, isNextDynamic, HttpContext.RequestAborted);
+            FlowAssignInfo flowAssignInfo =
+                await _workflowApplication.GetNextStepFlowAssignInfoAsync(workflow, startStep, dto, firstStepDefine, isNextDynamic, HttpContext.RequestAborted);
             //DateTime? expiredTime
             DateTime? expiredTime = startStep.StepExpiredTime;
 
             ///
             await _mediator.Publish(
-				new StartWorkflowNotify(workflow, dto, flowAssignInfo, startStep.WorkflowTrace), HttpContext.RequestAborted);
+                new StartWorkflowNotify(workflow, dto, flowAssignInfo, startStep.WorkflowTrace), HttpContext.RequestAborted);
 
-			//firstStep是否为end,t: 实际办理节点为startStep, 并且handlerId赋值 f: 实际办理节点为firstStep, handlerId未赋值
-			workflow.UpdateActualStepWhenHandle(startStep,
-				current.RequiredUserId, current.UserName,
-				current.RequiredOrgId, current.OrgName,
-				current.OrgAreaCode, current.OrgAreaName,
-				current.OrgLevel);
+            //firstStep是否为end,t: 实际办理节点为startStep, 并且handlerId赋值 f: 实际办理节点为firstStep, handlerId未赋值
+            workflow.UpdateActualStepWhenHandle(startStep,
+                current.RequiredUserId, current.UserName,
+                current.RequiredOrgId, current.OrgName,
+                current.OrgAreaCode, current.OrgAreaName,
+                current.OrgLevel);
 
-			workflow.UpdateCurrentStepWhenHandle(startStep,
-				current.OrgAreaCode, current.OrgAreaName, current.OrgLevel);
+            workflow.UpdateCurrentStepWhenHandle(startStep,
+                current.OrgAreaCode, current.OrgAreaName, current.OrgLevel);
 
-			var endTrace = await _workflowDomainService.EndAsync(workflow, dto, firstStepDefine,
-				startStep, current, expiredTime, HttpContext.RequestAborted);
-}
-       
-	}
+            var endTrace = await _workflowDomainService.EndAsync(workflow, dto, firstStepDefine,
+                startStep, current, expiredTime, HttpContext.RequestAborted);
+
+
+        }
+
+        _logger.LogInformation($"处理完成");
+    }
 
 }