order实际办理意见

src/Hotline.Api/StartupExtensions.cs

@@ -61,6 +61,7 @@ internal static class StartupExtensions
                     PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
                     DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
                     //Converters = { new JsonStringEnumConverter() }
+                    PropertyNameCaseInsensitive = true,
                 });
 #if DEBUG
                 d.UseHttpEndpoint("http://110.188.24.28:50202");
@@ -149,11 +150,11 @@ internal static class StartupExtensions
         //app.MapHub<CallCenterHub>("/hubs/callcenter");
         app.MapHub<HotlineHub>("/hubs/hotline");
 
-        //app.UseCloudEvents();
+        app.UseCloudEvents();
         app.MapControllers()
             .RequireAuthorization();
         //app.MapSubscribeHandler();
-        
+
         return app;
     }
 }

src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -51,7 +51,7 @@ public class Workflow : CreationEntity
     /// </summary>
     public EWorkflowStatus Status { get; set; }
 
-    #region 实际办理节点，部门
+    #region 实际办理数据（节点，部门，意见）
 
     /// <summary>
     /// 实际办理节点名称（会签状态此字段保存最外层会签办理节点名称）
@@ -76,6 +76,12 @@ public class Workflow : CreationEntity
     [SugarColumn(IsNullable = true)]
     public string? ActualHandleOrgCode { get; set; }
 
+    /// <summary>
+    /// 实际办理意见（办理中...or 最终办理意见）
+    /// </summary>
+    [SugarColumn(Length = 2000)]
+    public string ActualOpinion { get; set; } = "办理中...";
+
     #endregion
 
     /// <summary>
@@ -96,15 +102,9 @@ public class Workflow : CreationEntity
     public EProcessType ProcessType { get; set; } = EProcessType.Zhiban;
 
     /// <summary>
-    /// 交办时间
+    /// 交办时间(中心交部门办理时间)
     /// </summary>
-    public DateTime AssignTime { get; set; }
-
-    /// <summary>
-    /// 办理意见（冗余，办理中...or 最终办理意见）
-    /// </summary>
-    [SugarColumn(Length = 2000)]
-    public string Opinion { get; set; } = "办理中...";
+    public DateTime CenterToOrgTime { get; set; }
 
     /// <summary>
     /// 办理人id
@@ -180,7 +180,7 @@ public class Workflow : CreationEntity
     {
         Status = EWorkflowStatus.Terminated;
         CompleteTime = DateTime.Now;
-        Opinion = opinion;
+        ActualOpinion = opinion;
     }
 
     ///// <summary>
@@ -261,7 +261,7 @@ public class Workflow : CreationEntity
     /// <summary>
     /// 重置最终办理意见
     /// </summary>
-    public void ResetOption() => Opinion = "办理中...";
+    public void ResetOption() => ActualOpinion = "办理中...";
 
     /// <summary>
     /// 重新设置办理人（删除当前待办人/部门），撤回/跳转场景，因当前办理人不是流程指定办理人

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -68,7 +68,7 @@ namespace Hotline.FlowEngine.Workflows
                 StepBoxes = new(),
                 Traces = new(),
                 Definition = definition,
-                AssignTime = DateTime.Now,
+                CenterToOrgTime = DateTime.Now,
                 ExternalId = externalId,
                 AssignOrgCodes = new List<string> { userCode },
                 AssignUserIds = new List<string> { userId },
@@ -328,7 +328,7 @@ namespace Hotline.FlowEngine.Workflows
             {
                 workflow.ProcessType = EProcessType.Jiaoban;
                 workflow.ExpiredTime = CalculateExpiredTime(workflow.Definition.Code);
-                workflow.AssignTime = DateTime.Now;
+                workflow.CenterToOrgTime = DateTime.Now;
             }
 
             //最终办理意见与时间处理（解决工单业务需求，如果流程配置普通节点后未配置汇总节点则不会运行到此处）
@@ -339,7 +339,7 @@ namespace Hotline.FlowEngine.Workflows
             if (isAllCompleted)
             {
                 //最终办理
-                workflow.Opinion = dto.Opinion;
+                workflow.ActualOpinion = dto.Opinion;
                 workflow.Status = EWorkflowStatus.Marked;
                 await _mediator.Publish(new OrderFinalManageNotify(workflow), cancellationToken);
             }

src/Hotline/Orders/Order.cs

@@ -258,6 +258,37 @@ namespace Hotline.Orders
         public bool IsPublicity { get; set; }
 
 
+        #endregion
+
+        #region 流程信息
+
+        #region 实际办理数据（节点，部门，意见）
+
+        /// <summary>
+        /// 到达实际办理节点时间（stepBox创建时间）
+        /// </summary>
+        public DateTime? ActualHandleStepTime { get; set; }
+
+        /// <summary>
+        /// 实际办理部门名称
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
+        public string? ActualHandleOrgName { get; set; }
+
+        /// <summary>
+        /// 实际办理部门编码
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
+        public string? ActualHandleOrgCode { get; set; }
+
+        /// <summary>
+        /// 实际办理意见（办理中...or 最终办理意见）
+        /// </summary>
+        [SugarColumn(Length = 2000, DefaultValue = "")]
+        public string ActualOpinion { get; set; }
+
+        #endregion
+
         #endregion
     }