fixed: 省件撤单处理方案调整为特提至坐席

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -70,7 +70,7 @@ namespace Hotline.Application.Subscribers
         private readonly ISystemDicDataCacheManager _sysDicDataCacheManager;
         private readonly IOptions<CityBaseConfiguration> _cityBaseConfiguration;
 
-		public DataSharingSubscriber(
+        public DataSharingSubscriber(
             IRepository<OrderVisit> orderVisitRepository,
             IMapper mapper,
             IOrderRepository orderRepository,
@@ -132,7 +132,7 @@ namespace Hotline.Application.Subscribers
             _orderPublishRepository = orderPublishRepository;
             _sysDicDataCacheManager = sysDicDataCacheManager;
             _cityBaseConfiguration = cityBaseConfiguration;
-		}
+        }
 
         /// <summary>
         /// 接收工单退回结果
@@ -240,7 +240,8 @@ namespace Hotline.Application.Subscribers
             };
             await _orderRevokeRepository.AddAsync(orderRevoke, cancellationToken);
 
-            var current = SessionContextCreator.CreateSessionContext(dto.Source,_cityBaseConfiguration.Value);
+            //宜宾需求：特提至中心（派单组?），由派单员归档
+            var current = SessionContextCreator.CreateSessionContext(dto.Source, _cityBaseConfiguration.Value);
             if (string.IsNullOrEmpty(order?.WorkflowId))
             {
                 var startDto = new StartWorkflowDto
@@ -249,15 +250,18 @@ namespace Hotline.Application.Subscribers
                     Title = order.Title,
                     Opinion = dto.Opinion,
                 };
-                await _workflowApplication.StartToEndAsync(startDto, current, order.Id, order.ExpiredTime,
+                //await _workflowApplication.StartToEndAsync(startDto, current, order.Id, order.ExpiredTime,
+                //    cancellationToken);
+                await _workflowApplication.StartWorkflowAsync(startDto, current, order.Id, order.ExpiredTime,
                     cancellationToken);
             }
             else
             {
                 //await _workflowApplication.HandleToEndAsync(current, order.WorkflowId, dto.Opinion, null,
                 //    cancellationToken: cancellationToken);
-                await _workflowApplication.JumpToEndAsync(current, order.WorkflowId, dto.Opinion, null, order.ExpiredTime,
-                    cancellationToken: cancellationToken);
+                //await _workflowApplication.JumpToEndAsync(current, order.WorkflowId, dto.Opinion, null, order.ExpiredTime,
+                //    cancellationToken: cancellationToken);
+                await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, dto.Opinion, current, cancellationToken);
             }
         }
 
@@ -417,7 +421,7 @@ namespace Hotline.Application.Subscribers
                             x.Status == EScreenStatus.Approval)
                 .FirstAsync(cancellationToken);
 
-            var current = SessionContextCreator.CreateSessionContext(dto.Source,_cityBaseConfiguration.Value);
+            var current = SessionContextCreator.CreateSessionContext(dto.Source, _cityBaseConfiguration.Value);
             await _workflowApplication.HandleToEndAsync(current,
                 orderScreen.WorkflowId, "省上推送甄别结果", null,
                 dto.ProvinceScreenResult.AuditResult
@@ -550,7 +554,7 @@ namespace Hotline.Application.Subscribers
             {
                 //处理省下行回访
                 var order = await _orderRepository.Queryable().Where(x => x.ReceiveProvinceNo == dto.ProvinceNo).FirstAsync();
-                if (order !=null)
+                if (order != null)
                 {
                     //判断是否有发布数据
                     var orderPublish = await _orderPublishRepository.Queryable()
@@ -606,22 +610,22 @@ namespace Hotline.Application.Subscribers
                     orgDetail.VisitOrgCode = order.ActualHandleOrgCode;
                     orgDetail.VisitOrgName = order.ActualHandleOrgName;
                     orgDetail.VisitTarget = EVisitTarget.Org;
-                    
-                    
+
+
                     orgDetail.OrgProcessingResults = satisfy;
 
                     visitedDetail.Add(orgDetail);
                     //TODO 自贡办件态度
 
 
-                    await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail,cancellationToken);
-                    order.Visited(satisfy.Key,satisfy.Value);
+                    await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail, cancellationToken);
+                    order.Visited(satisfy.Key, satisfy.Value);
                     order.Status = EOrderStatus.Visited;
                     await _orderRepository.UpdateAsync(order, cancellationToken);
 
                 }
-                
-                
+
+
             }
         }