Merge branch 'release' of http://git.12345lm.cn/Fengwo/hotline into release

src/Hotline.Api/Controllers/OrderController.cs

@@ -1967,7 +1967,7 @@ public class OrderController : BaseController
         try
         {
             //二次回访会改写数据
-            await _orderRepository.OrderScreenRevisionVisit(visit.Id, false, HttpContext.RequestAborted);
+            //await _orderRepository.OrderScreenRevisionVisit(visit.Id, false, HttpContext.RequestAborted);
             var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
             startDto.DefinitionModuleCode = WorkflowModuleConsts.OrderScreen;
             startDto.Opinion = dto.Data.Content;

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -325,8 +325,27 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
         var targetStepDefine = _workflowDomainService.GetStepDefine(workflow.WorkflowDefinition, dto.NextStepCode);
         if (targetStepDefine.StepType is EStepType.End)
             throw UserFriendlyException.SameMessage("结束节点不支持撤回");
-        //var isStartCountersign = targetStepDefine.CouldPrevStartCountersign(dto.NextHandlers.Count);
-        var flowAssignInfo = await GetNextStepFlowAssignInfoByDefineAsync(targetStepDefine, dto.HandlerType, dto.IsStartCountersign,
+		//var isStartCountersign = targetStepDefine.CouldPrevStartCountersign(dto.NextHandlers.Count);
+		var targetStep = workflow.Steps.FirstOrDefault(d => d.Code == dto.NextStepCode && d.IsOrigin);
+		if (targetStep is null)
+			throw UserFriendlyException.SameMessage("该流程尚未流转至该节点");
+
+		///退回到派单组 没有下一步办理人 获取之前节点办理人
+		if (!dto.NextHandlers.Any())
+		{
+			dto.NextHandlers.Add(new FlowStepHandler()
+			{
+				UserId = targetStep.HandlerId,
+				Username = targetStep.HandlerName,
+				OrgId = targetStep.HandlerOrgId,
+				OrgName = targetStep.HandlerOrgName,
+				Key = targetStep.HandlerId,
+				Value = targetStep.HandlerName,
+				RoleId = targetStep.RoleId,
+				RoleName = targetStep.RoleName
+			});
+		}
+		var flowAssignInfo = await GetNextStepFlowAssignInfoByDefineAsync(targetStepDefine, dto.HandlerType, dto.IsStartCountersign,
             dto.NextHandlers.Select(d => new Kv(d.Key, d.Value)).ToList(), cancellationToken);
 
         //var stepHandlers = await GetNextStepHandlersAsync(workflow, targetStepDefine, dto, cancellationToken);

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -909,6 +909,16 @@ namespace Hotline.Application.Subscribers
         {
             //todo
         }
+
+        /// <summary>
+        ///  天阙推送工单，返回信息
+        /// </summary>
+        /// <returns></returns>
+        [CapSubscribe(EventNames.TianQuePushOrderReceiver)]
+        public async Task TianQuePushOrderReceiver(TianQuePushOrderReceiverDto dto, CancellationToken cancellationToken)
+        {
+            //todo
+        }
     }
 
 }

src/Hotline.Share/Dtos/DataSharing/PusherHotlineDto/TianQuePushOrderReceiverDto.cs

@@ -0,0 +1,23 @@
+namespace Hotline.Share.Dtos.DataSharing.PusherHotlineDto
+{
+    /// <summary>
+    /// 天阙推送工单返回
+    /// </summary>
+    public class TianQuePushOrderReceiverDto
+    {
+        /// <summary>
+        /// 网格员编号
+        /// </summary>
+        public string? AppealNumber { get; set; }
+
+        /// <summary>
+        /// 区域id
+        /// </summary>
+        public string? OrgId { get; set; }
+
+        /// <summary>
+        /// 自动退回时间
+        /// </summary>
+        public DateTime? AutoBackTime { get; set; }
+    }
+}

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.102</Version>
+    <Version>1.0.103</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Hotline.Share/Mq/EventNames.Share.cs

@@ -109,5 +109,10 @@
         /// 接收天阙办理结果
         /// </summary>
         public const string TianQueReceiverOpinion = "tian.que.receiver.opinion";
+
+        /// <summary>
+        /// 天阙推送工单，返回信息
+        /// </summary>
+        public const string TianQuePushOrderReceiver = "tian.que.push.order.receiver";
     }
 }