Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Application/Subscribers/OrderSubscriber.cs

@@ -10,6 +10,10 @@ namespace Hotline.Application.Subscribers
 {
     public class OrderSubscriber : ICapSubscribe, ISingletonDependency
     {
-       
+       //[CapSubscribe(Hotline.Share.Mq.EventNames.HotlineOrderVisitGet)]
+       //public async Task OrderVisitWeb(xxx dto, CancellationToken cancellationToken)
+       //{
+
+       //}
     }
 }

src/Hotline.Share/Dtos/Order/OrderVisitDto.cs

@@ -414,12 +414,6 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public DateTime? VisitTime { get; set; }
 
-
-        /// <summary>
-        /// 回访状态
-        /// </summary>
-        public EVisitState VisitState { get; set; }
-
         /// <summary>
         /// 回访明细
         /// </summary>

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

@@ -8,6 +8,8 @@ namespace Hotline.Share.Mq
 {
     public partial class EventNames
     {
+        #region  推送
+
         /// <summary>
         /// 热线工单流程开启
         /// </summary>
@@ -58,10 +60,10 @@ namespace Hotline.Share.Mq
         /// </summary>
         public const string HotlineOrderScreenApplyed = "hotline.order.screen.applyed";
 
-		/// <summary>
-		/// 督办过程
-		/// </summary>
-		public const string HotlineOrderSuperviseCourse = "hotline.order.supervise.course";
+        /// <summary>
+        /// 督办过程
+        /// </summary>
+        public const string HotlineOrderSuperviseCourse = "hotline.order.supervise.course";
 
         /// <summary>
         /// 督办结果
@@ -88,5 +90,13 @@ namespace Hotline.Share.Mq
         /// </summary>
         public const string HotlineOrderPublishOrder = "hotline.order.publish.order";
 
+        #endregion
+
+        #region 接收订阅
+
+        public const string HotlineOrderVisitGet = "hotline.order.visit.get";
+
+
+        #endregion
     }
 }

src/Hotline/FlowEngine/Workflows/WorkflowCountersignMember.cs

@@ -15,7 +15,9 @@ public class WorkflowCountersignMember : CreationEntity
     /// </summary>
     public EFlowAssignType? FlowAssignType { get; set; }
 
-    public string Name { get; set; }
+    public string Key { get; set; }
+
+    public string Value { get; set; }
 
     public bool IsHandled { get; set; }
 }

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1210,8 +1210,8 @@ namespace Hotline.FlowEngine.Workflows
         {
             var members = handlers.Select(d => new WorkflowCountersignMember
             {
-                Id = d.Key,
-                Name = d.Value,
+                Key = d.Key,
+                Value = d.Value,
                 FlowAssignType = flowAssignType
             }).ToList();