uncompleted

src/Hotline.Api/StartupExtensions.cs

@@ -34,7 +34,7 @@ internal static class StartupExtensions
         services.AddHttpContextAccessor();
 
 #if DEBUG
-        builder.WebHost.UseUrls("http://*:50100");
+        builder.WebHost.UseUrls("http://*:51100");
 #endif
         
         //services.Configure<DeviceConfigs>(d => configuration.GetSection(nameof(DeviceConfigs)).Bind(d));

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

@@ -44,10 +44,15 @@ public class BasicWorkflowDto : EndWorkflowDto
     /// </summary>
     public string? NextMainHandler { get; set; }
 
+    ///// <summary>
+    ///// 发起会签
+    ///// </summary>
+    //public bool IsStartCountersign { get; set; }
+    
     /// <summary>
-    /// 发起会签
+    /// 办理方式
     /// </summary>
-    public bool IsStartCountersign { get; set; }
+    public EHandleMode HandleMode { get; set; }
 
     /// <summary>
     /// 外部业务参数

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

@@ -0,0 +1,22 @@
+namespace Hotline.Share.Enums.FlowEngine;
+
+/// <summary>
+/// 办理方式
+/// </summary>
+public enum EHandleMode
+{
+    /// <summary>
+    /// 正常办理
+    /// </summary>
+    Normal = 0,
+
+    /// <summary>
+    /// 开启会签
+    /// </summary>
+    StartCountersign = 1,
+
+    /// <summary>
+    /// 开启或签
+    /// </summary>
+    StartSignCountersign = 2
+}

src/Hotline/FlowEngine/Workflows/StepBasicEntity.cs

@@ -14,6 +14,9 @@ public abstract class StepBasicEntity : CreationEntity
 {
     public string WorkflowId { get; set; }
 
+    /// <summary>
+    /// 业务唯一标识
+    /// </summary>
     public string? ExternalId { get; set; }
 
     #region 业务模块(冗余)
@@ -206,6 +209,13 @@ public abstract class StepBasicEntity : CreationEntity
     /// </summary>
     public DateTime? HandleTime { get; set; }
 
+    /// <summary>
+    /// 角色id（如果指派给角色）
+    /// </summary>
+    public string? RoleId { get; set; }
+
+    public string? RoleName { get; set; }
+
     #endregion
 
     #region Definition
@@ -409,4 +419,16 @@ public abstract class StepBasicEntity : CreationEntity
     public bool IsInCountersign() => CountersignPosition != ECountersignPosition.None;
 
     #endregion
-}
+}
+
+/*
+feature: 
+1. step增加字段记录roleId, roleName
+2. 指派时为对应办理对象赋值，办理时为所有办理对象字段赋值
+3. 配置办理对象为角色时，如果未指定办理人则指派给角色办理
+4. thk从默认派单池中分配给对应办理人时指定办理对象
+refactor:
+1. step增加字段记录发起会签或是或签
+2. status增加或签无需办理状态
+3. 办理节点时判断是否立即结束会签或者等全部节点办完再结束
+ */

src/XF.Domain/Entities/IWorkflow.cs

@@ -72,10 +72,10 @@ public enum EFlowAssignType
     /// </summary>
     User = 1,
 
-    ///// <summary>
-    ///// 指派到角色
-    ///// </summary>
-    //Role = 2,
+    /// <summary>
+    /// 指派到角色
+    /// </summary>
+    Role = 2,
 }
 
 /// <summary>