ExternalId

src/Hotline.Api/Controllers/WorkflowController.cs

@@ -495,14 +495,13 @@ public class WorkflowController : BaseController
     {
         var levels = new List<int> { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
         var orgs = levels.Select(d => new KeyValuePair<string, string>(d.ToString(), $"{d.ToChinese()}级部门办理")).ToList();
-        var center = new KeyValuePair<string, string>("center", "中心办理");
+        var center = new KeyValuePair<string, string>("0", "中心办理");
         var centerIsTop = new List<KeyValuePair<string, string>> { center };
         centerIsTop.AddRange(orgs);
         return new
         {
             ModuleOptions = WorkflowModuleConsts.AllModules.Select(d => new KeyValuePair<string, string>(d.Code, d.Name)),
             HandlerTypeOptions = EnumExts.GetDescriptions<EHandlerType>(),
-            CountersignMode = EnumExts.GetDescriptions<ECountersignMode>().Where(d => d.Key != 1),
             BusinessTypeOptions = EnumExts.GetDescriptions<EBusinessType>(),
             StepPropertiesOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.WorkflowStepComponent, HttpContext.RequestAborted),
             //PathPolicyOptions = EnumExts.GetDescriptions<EPathPolicy>(),

src/Hotline.Share/Dtos/FlowEngine/StepBasicDto.cs → src/Hotline.Share/Dtos/FlowEngine/Workflow/StepBasicDto.cs

@@ -1,6 +1,6 @@
 using Hotline.Share.Enums.FlowEngine;
 
-namespace Hotline.Share.Dtos.FlowEngine
+namespace Hotline.Share.Dtos.FlowEngine.Workflow
 {
     public class StepBasicDto
     {
@@ -31,10 +31,10 @@ namespace Hotline.Share.Dtos.FlowEngine
         /// </summary>
         public List<Kv> HandlerClassifies { get; set; } = new();
 
-        /// <summary>
-        /// 会签模式
-        /// </summary>
-        public ECountersignMode CountersignMode { get; set; }
+        ///// <summary>
+        ///// 会签模式
+        ///// </summary>
+        //public ECountersignMode CountersignMode { get; set; }
 
         /// <summary>
         /// 发起会签节点code（不支持发起会签节点无此字段）

src/Hotline.Share/Dtos/FlowEngine/WorkflowStepDto.cs

@@ -32,10 +32,10 @@ public class WorkflowStepDto
     /// </summary>
     public List<Kv> HandlerClassifies { get; set; } = new();
 
-    /// <summary>
-    /// 会签模式
-    /// </summary>
-    public ECountersignMode CountersignMode { get; set; }
+    ///// <summary>
+    ///// 会签模式
+    ///// </summary>
+    //public ECountersignMode CountersignMode { get; set; }
 
     public EWorkflowStepStatus Status { get; set; }
 

src/Hotline.Share/Enums/FlowEngine/ECountersignMode.cs

@@ -1,33 +1,33 @@
-using System.ComponentModel;
+//using System.ComponentModel;
 
-namespace Hotline.Share.Enums.FlowEngine;
+//namespace Hotline.Share.Enums.FlowEngine;
 
-/// <summary>
-/// 会签模式
-/// </summary>
-public enum ECountersignMode
-{
-    /// <summary>
-    /// 不支持办理会签
-    /// </summary>
-    [Description("不支持办理会签")]
-    UnSupport = 0,
+///// <summary>
+///// 会签模式
+///// </summary>
+//public enum ECountersignMode
+//{
+//    /// <summary>
+//    /// 不支持办理会签
+//    /// </summary>
+//    [Description("不支持办理会签")]
+//    UnSupport = 0,
 
-    ///// <summary>
-    ///// 立即汇总（在发起会签的当前节点进行汇总才会继续下一节点，无需另行配置汇总节点）
-    ///// </summary>
-    //[Description("立即汇总")]
-    //GatherImmediately = 1,
+//    ///// <summary>
+//    ///// 立即汇总（在发起会签的当前节点进行汇总才会继续下一节点，无需另行配置汇总节点）
+//    ///// </summary>
+//    //[Description("立即汇总")]
+//    //GatherImmediately = 1,
 
-    ///// <summary>
-    ///// 稍后汇总，延迟汇总（不会在会签发起节点进行汇总，汇总节点需单独配置）
-    ///// </summary>
-    //[Description("支持办理会签")]
-    //GatherLater = 2
+//    ///// <summary>
+//    ///// 稍后汇总，延迟汇总（不会在会签发起节点进行汇总，汇总节点需单独配置）
+//    ///// </summary>
+//    //[Description("支持办理会签")]
+//    //GatherLater = 2
 
-    /// <summary>
-    /// 支持办理会签
-    /// </summary>
-    [Description("支持办理会签")]
-    Support = 2
-}
+//    /// <summary>
+//    /// 支持办理会签
+//    /// </summary>
+//    [Description("支持办理会签")]
+//    Support = 2
+//}

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -106,7 +106,7 @@ namespace Hotline.FlowEngine.Workflows
                 NextSteps = nextSteps,
                 IsMain = true,
                 Status = EWorkflowStepStatus.WaitForHandle,
-                PrevChosenStepCode = "start",
+                PrevChosenStepCode = null,
             };
             _mapper.Map(workflow.WorkflowDefinition, startStep);
             await _workflowStepRepository.AddAsync(startStep, cancellationToken);

src/Hotline/Orders/Order.cs

@@ -496,27 +496,32 @@ namespace Hotline.Orders
         /// </summary>
         public DateTime? ExpiredTimeProvince { get; set; }
 
-        /// <summary>
-        /// 省工单编号（冗余）
-        /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string? FromProvinceNo { get; set; }
+        ///// <summary>
+        ///// 省工单编号（冗余）
+        ///// </summary>
+        //[SugarColumn(IsNullable = true)]
+        //public string? FromProvinceNo { get; set; }
 
-        /// <summary>
-        /// 同步省工单编号（按省工单要求生成的编号，冗余）
-        /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string? ToProvinceNo { get; set; }
+        ///// <summary>
+        ///// 同步省工单编号（按省工单要求生成的编号，冗余）
+        ///// </summary>
+        //[SugarColumn(IsNullable = true)]
+        //public string? ToProvinceNo { get; set; }
 
-        #endregion
+        //#endregion
 
-        #region 110字段
+        //#region 110字段
+
+        ///// <summary>
+        ///// 110工单编号（从110来的和推送给110的都用该字段记录唯一标识）
+        ///// </summary>
+        //[SugarColumn(IsNullable = true)]
+        //public string? No110 { get; set; }
 
         /// <summary>
-        /// 110工单编号（从110来的和推送给110的都用该字段记录唯一标识）
+        /// 外部工单唯一标识
         /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string? No110 { get; set; }
+        public string? ExternalId { get; set; }
 
         #endregion
     }