浏览代码

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

xf 1 年之前
父节点
当前提交
c3978401bb
共有 2 个文件被更改,包括 11 次插入2 次删除
  1. 7 2
      src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs
  2. 4 0
      src/Hotline/Orders/OrderSpecial.cs

+ 7 - 2
src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs

@@ -128,10 +128,15 @@ namespace Hotline.Share.Dtos.Order
 
 		public string OrderId { get; set; }
 
+		public string WorkflowId { get; set; }
+
 		/// <summary>
-		/// 节点Id
+		/// 下一节点code(defineStep.code)
 		/// </summary>
-		public string StepId { get; set; }
+		public string NextStepCode { get; set; } = string.Empty;
+		public string NextStepName { get; set; } = string.Empty;
+
+		public List<Kv> NextHandlers { get; set; }
 
 		/// <summary>
 		/// 特提原因

+ 4 - 0
src/Hotline/Orders/OrderSpecial.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Hotline.FlowEngine.Workflows;
+using Hotline.Share.Dtos;
 using Hotline.Share.Enums.Settings;
 using SqlSugar;
 using XF.Domain.Repository;
@@ -24,6 +25,9 @@ namespace Hotline.Orders
         public string NextStepCode { get; set; } = string.Empty;
         public string NextStepName { get; set; } = string.Empty;
 
+        [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
+		public List<Kv> NextHandlers { get; set; }
+
 		/// <summary>
 		/// 特提原因
 		/// </summary>