Browse Source

完成输入框新增的选项

qinchaoyue 7 months ago
parent
commit
b9033a229f

+ 2 - 0
src/Hotline.Application/Mappers/WorkflowMapperConfigs.cs

@@ -77,6 +77,8 @@ public class WorkflowMapperConfigs : IRegister
             .Map(d => d.RealCommunicationAddress, s => s.RealCommunicationAddress)
             .Map(d => d.RealIsContacted, s => s.RealIsContacted)
             .Map(d => d.RealContactLocale, s => s.RealContactLocale)
+            .Map(d => d.Other, s => s.Other)
+            .Map(d => d.OtherRemark, s => s.OtherRemark)
             .IgnoreNonMapped(true);
 
         config.ForType<Workflow, WorkflowStep>()

+ 19 - 0
src/Hotline.Share/Dtos/FlowEngine/NextWorkflowDto.cs

@@ -1,4 +1,5 @@
 using Hotline.Share.Enums.FlowEngine;
+using System.ComponentModel;
 
 namespace Hotline.Share.Dtos.FlowEngine;
 
@@ -49,14 +50,31 @@ public class NextWorkflowDto : BasicWorkflowDto
 
     /// <summary>
     /// 已与市民沟通
+    /// 已与市民电话联系,确认办理结果
     /// </summary>
+    [Description("已与市民电话联系,确认办理结果")]
     public bool? RealIsContacted { get; set; }
 
     /// <summary>
     /// 已与市民现场沟通
+    /// 已赴现场处置,将处理结果告知市民
     /// </summary>
+    [Description("已赴现场处置,将处理结果告知市民")]
     public bool? RealContactLocale { get; set; }
 
+    #region task_298
+    /// <summary>
+    /// 其它
+    /// </summary>
+    [Description("其它")]
+    public bool? Other { get; set; }
+
+    /// <summary>
+    /// 其它原因
+    /// </summary>
+    [Description("其它原因")]
+    public string? OtherRemark { get; set; }
+
     /// <summary>
     /// 是否紧急
     /// </summary>
@@ -77,4 +95,5 @@ public class NextWorkflowDto : BasicWorkflowDto
     /// </summary>
     public string? LeaderSMSKey { get; set; }
     #endregion
+    #endregion
 }

+ 15 - 0
src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -7,6 +7,7 @@ using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
 using SqlSugar;
+using System.ComponentModel;
 using XF.Domain.Entities;
 using XF.Domain.Exceptions;
 using XF.Domain.Extensions;
@@ -157,6 +158,20 @@ public partial class Workflow : CreationEntity
     /// </summary>
     public bool? RealContactLocale { get; set; }
 
+    #region task_298
+    /// <summary>
+    /// 其它
+    /// </summary>
+    [Description("其它")]
+    public bool? Other { get; set; }
+
+    /// <summary>
+    /// 其它原因
+    /// </summary>
+    [Description("其它原因")]
+    public string? OtherRemark { get; set; }
+    #endregion
+
     #endregion
 
     #region 当前办理节点信息(指派时赋值)