src/Hotline.Api/Controllers/OrderController.cs

@@ -64,7 +64,7 @@ public class OrderController : BaseController
     public async Task<PagedDto<OrderDto>> Query([FromQuery] QueryOrderDto dto)
     {
         var (total, items) = await _orderRepository.Queryable()
-            .Includes(d=>d.Employee)
+            .Includes(d => d.Employee)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword) || d.No.Contains(dto.Keyword))
             .WhereIF(!string.IsNullOrEmpty(dto.Content), d => d.Content.Contains(dto.Content))
             .WhereIF(dto.AcceptTypes.Any(), d => dto.AcceptTypes.Contains(d.AcceptType))
@@ -77,7 +77,7 @@ public class OrderController : BaseController
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
             .WhereIF(dto.EmergencyLevels.Any(), d => dto.EmergencyLevels.Contains(d.EmergencyLevel))
             .WhereIF(!string.IsNullOrEmpty(dto.PhoneNo), d => d.FromPhone.Contains(dto.PhoneNo) || d.Contact.Contains(dto.PhoneNo))
-            .WhereIF(dto.PushType.HasValue, d => d.PushType == dto.PushType)
+            .WhereIF(!string.IsNullOrEmpty(dto.PushTypeCode), d => d.PushTypeCode == dto.PushTypeCode)
             .WhereIF(dto.ExpiredTimeStart.HasValue, d => d.ExpiredTime >= dto.ExpiredTimeStart)
             .WhereIF(dto.ExpiredTimeEnd.HasValue, d => d.ExpiredTime <= dto.ExpiredTimeEnd)
             .WhereIF(dto.Statuses.Any(), d => dto.Statuses.Contains(d.Status))
@@ -108,7 +108,7 @@ public class OrderController : BaseController
     public async Task<OrderDto> Get(string id)
     {
         var order = await _orderRepository.Queryable()
-            .Includes(d=>d.Employee)
+            .Includes(d => d.Employee)
             .Includes(d => d.OrderComplain)
             .Includes(d => d.OrderReport)
             .FirstAsync(d => d.Id == id);
@@ -204,7 +204,7 @@ public class OrderController : BaseController
             ChannelOptions = EnumExts.GetDescriptions<EChannel>(),
             OrgsOptions = await _organizeRepository.GetOrgJson(),
             EmergencyLevelOptions = EnumExts.GetDescriptions<EEmergencyLevel>(),
-            PushTypeOptions = EnumExts.GetDescriptions<EPushType>(),
+            PushTypeOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.PushType),
             OrderStatusOptions = EnumExts.GetDescriptions<EOrderStatus>(),
         };
         return rsp;
@@ -222,12 +222,12 @@ public class OrderController : BaseController
             ChannelOptions = EnumExts.GetDescriptions<EChannel>(),
             GenderOptions = EnumExts.GetDescriptions<EGender>(),
             IdentityTypeOptions = EnumExts.GetDescriptions<EIdentityType>(),
-            LicenceTypeOptions = EnumExts.GetDescriptions<ELicenceType>(),
+            LicenceTypeOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.LicenceType),
             AgeRangeOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.AgeRange),
             OrderTypeOptions = EnumExts.GetDescriptions<EOrderType>(),
             AcceptTypeOptions = EnumExts.GetDescriptions<EAcceptType>(),
             EmergencyLevelOptions = EnumExts.GetDescriptions<EEmergencyLevel>(),
-            PushTypeOptions = EnumExts.GetDescriptions<EPushType>(),
+            PushTypeOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.PushType),
         };
         return rsp;
     }
@@ -255,8 +255,8 @@ public class OrderController : BaseController
             SalesModeOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.SalesMode),
             ECommercePlatformOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.ECommercePlatform),
             PatentTypeOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.PatentType),
+            AffairTargetOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.AffairTarget),
             ComplainTypeOptions = EnumExts.GetDescriptions<EComplainType>(),
-            ComplainTargetOptions = EnumExts.GetDescriptions<EOrderTarget>(),
         };
         return rsp;
     }

src/Hotline.Share/Dtos/Order/OrderComplainDto.cs

@@ -21,7 +21,9 @@ public class OrderComplainDto : OrderExtensionDto
     /// <summary>
     /// 投诉目标，销售方式为“网购”时展示该字段且必填
     /// </summary>
-    public EOrderTarget? ComplainTarget { get; set; }
+    public string? ComplainTargetCode { get; set; }
+
+    public string? ComplainTarget { get; set; }
 
     /// <summary>
     /// 经营地址，销售方式为“现场”时必填

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -141,7 +141,9 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 证件类型
         /// </summary>
-        public ELicenceType? Licence { get; set; }
+        public string? LicenceTypeCode { get; set; }
+
+        public string? LicenceType { get; set; }
 
         /// <summary>
         /// 证件号码
@@ -223,7 +225,9 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 推送分类
         /// </summary>
-        public EPushType PushType { get; set; }
+        public string? PushTypeCode { get; set; }
+
+        public string? PushType { get; set; }
 
         /// <summary>
         /// 附件

src/Hotline.Share/Dtos/Order/OrderReportDto.cs

@@ -16,7 +16,8 @@ public class OrderReportDto : OrderExtensionDto
     /// <summary>
     /// 举报目标，销售方式为“网购”时展示该字段且必填
     /// </summary>
-    public EOrderTarget? ReportTarget { get; set; }
+    public string? ReportTargetCode { get; set; }
+    public string? ReportTarget { get; set; }
 
     #endregion
 }

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -65,7 +65,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 推送分类
         /// </summary>
-        public EPushType? PushType { get; set; }
+        public string? PushTypeCode { get; set; }
 
         /// <summary>
         /// 过期时间

src/Hotline.Share/Enums/Order/EGender.cs

@@ -11,9 +11,9 @@ public enum EGender
     [Description("未知")]
     Unknown = 0,
 
-    [Description("男")]
+    [Description("先生")]
     Male = 1,
     
-    [Description("女")]
+    [Description("女士")]
     Female = 2,
 }

src/Hotline.Share/Enums/Order/ELicenceType.cs

@@ -1,36 +0,0 @@
-using System.ComponentModel;
-
-namespace Hotline.Share.Enums.Order;
-
-/// <summary>
-/// 证件类型
-/// </summary>
-public enum ELicenceType
-{
-    [Description("未知")]
-    Unknown = 0,
-
-    /// <summary>
-    /// 身份证
-    /// </summary>
-    [Description("身份证")]
-    IdCard = 1,
-
-    /// <summary>
-    /// 护照
-    /// </summary>
-    [Description("护照")]
-    Passport = 2,
-
-    /// <summary>
-    /// 港澳通行证
-    /// </summary>
-    [Description("港澳通行证")]
-    HongKongMacaoTravelPermit = 3,
-
-    /// <summary>
-    /// 台湾通行证
-    /// </summary>
-    [Description("台湾通行证")]
-    TaiwanTravelPermit = 4,
-}

src/Hotline.Share/Enums/Order/EOrderTarget.cs

@@ -1,20 +1,20 @@
-using System.ComponentModel;
+//using System.ComponentModel;
 
-namespace Hotline.Share.Enums.Order;
+//namespace Hotline.Share.Enums.Order;
 
-public enum EOrderTarget
-{
-    //平台、入驻商家
+//public enum EOrderTarget //todo c
+//{
+//    //平台、入驻商家
 
-    /// <summary>
-    /// 平台
-    /// </summary>
-    [Description("平台")]
-    Platform = 0,
+//    /// <summary>
+//    /// 平台
+//    /// </summary>
+//    [Description("平台")]
+//    Platform = 0,
 
-    /// <summary>
-    /// 入驻商家
-    /// </summary>
-    [Description("入驻商家")]
-    Merchant
-}
+//    /// <summary>
+//    /// 入驻商家
+//    /// </summary>
+//    [Description("入驻商家")]
+//    Merchant
+//}

src/Hotline.Share/Enums/Order/EPushType.cs

@@ -1,31 +1,31 @@
-using System.ComponentModel;
+//using System.ComponentModel;
 
-namespace Hotline.Share.Enums.Order;
+//namespace Hotline.Share.Enums.Order;
 
-/// <summary>
-/// 推送分类
-/// </summary>
-public enum EPushType
-{
-    //人力资源社会保障厅、交通运输厅、文旅和旅游厅、中小企业款项支付“指引诉求”、中小企业款项支付“跟办诉求”、中小企业款项支付“咨询诉求”、110
-    [Description("人力资源社会保障厅")]
-    Rlzyshbzt = 0,
+///// <summary>
+///// 推送分类
+///// </summary>
+//public enum EPushType //todo c
+//{
+//    //人力资源社会保障厅、交通运输厅、文旅和旅游厅、中小企业款项支付“指引诉求”、中小企业款项支付“跟办诉求”、中小企业款项支付“咨询诉求”、110
+//    [Description("人力资源社会保障厅")]
+//    Rlzyshbzt = 0,
 
-    [Description("交通运输厅")]
-    Jtyst = 1,
+//    [Description("交通运输厅")]
+//    Jtyst = 1,
 
-    [Description("文旅和旅游厅")]
-    Wlt = 2,
+//    [Description("文旅和旅游厅")]
+//    Wlt = 2,
 
-    [Description("中小企业款项支付“指引诉求”")]
-    ZxqyZysq = 3,
+//    [Description("中小企业款项支付“指引诉求”")]
+//    ZxqyZysq = 3,
 
-    [Description("中小企业款项支付“跟办诉求”")]
-    ZxqyGbsq = 4,
+//    [Description("中小企业款项支付“跟办诉求”")]
+//    ZxqyGbsq = 4,
 
-    [Description("中小企业款项支付“咨询诉求”")]
-    ZxqyZxsq = 5,
+//    [Description("中小企业款项支付“咨询诉求”")]
+//    ZxqyZxsq = 5,
 
-    [Description("110")]
-    GongAn110 = 6,
-}
+//    [Description("110")]
+//    GongAn110 = 6,
+//}

src/Hotline/Orders/Citizen.cs

@@ -33,7 +33,11 @@ namespace Hotline.Orders
         /// <summary>
         /// 证件类型
         /// </summary>
-        public ELicenceType? Licence { get; set; }
+        [SugarColumn(IsNullable = true)]
+        public string? LicenceTypeCode { get; set; }
+
+        [SugarColumn(IsNullable = true)]
+        public string? LicenceType { get; set; }
 
         /// <summary>
         /// 证件号码

src/Hotline/Orders/Order.cs

@@ -52,11 +52,16 @@ namespace Hotline.Orders
         /// <summary>
         /// 证件类型
         /// </summary>
-        public ELicenceType? LicenceType { get; set; }
+        [SugarColumn(IsNullable = true)]
+        public string? LicenceTypeCode { get; set; }
+
+        [SugarColumn(IsNullable = true)]
+        public string? LicenceType { get; set; }
 
         /// <summary>
         /// 证件号码
         /// </summary>
+        [SugarColumn(IsNullable = true)]
         public string? LicenceNo { get; set; }
 
         /// <summary>
@@ -129,7 +134,8 @@ namespace Hotline.Orders
         /// <summary>
         /// 外部数据（为前端提供级联功能）
         /// </summary>
-        public string HotspotExternal { get; set; }
+        [SugarColumn(IsNullable = true)]
+        public string? HotspotExternal { get; set; }
 
         /// <summary>
         /// 事发时间
@@ -148,7 +154,11 @@ namespace Hotline.Orders
         /// <summary>
         /// 推送分类
         /// </summary>
-        public EPushType PushType { get; set; }
+        [SugarColumn(IsNullable = true)]
+        public string? PushTypeCode { get; set; }
+
+        [SugarColumn(IsNullable = true)]
+        public string? PushType { get; set; }
 
         /// <summary>
         /// 附件

src/Hotline/Orders/OrderComplain.cs

@@ -26,7 +26,11 @@ public class OrderComplain : OrderExtensionEntity
     /// <summary>
     /// 投诉目标，销售方式为“网购”时展示该字段且必填
     /// </summary>
-    public EOrderTarget? ComplainTarget { get; set; }
+    [SugarColumn(IsNullable = true)]
+    public string? ComplainTargetCode { get; set; }
+
+    [SugarColumn(IsNullable = true)]
+    public string? ComplainTarget { get; set; }
 
     /// <summary>
     /// 经营地址，销售方式为“现场”时必填
@@ -39,7 +43,7 @@ public class OrderComplain : OrderExtensionEntity
     public string? BussinessAddress { get; set; }
 
     /// <summary>
-    /// 诉求类型，多选
+    /// 诉求内容，多选
     /// </summary>
     [SugarColumn(ColumnDataType = "varchar(600)", IsJson = true)]
     public List<EComplainType> ComplainTypes { get; set; } = new();

src/Hotline/Orders/OrderReport.cs

@@ -20,7 +20,11 @@ public class OrderReport : OrderExtensionEntity
     /// <summary>
     /// 举报目标，销售方式为“网购”时展示该字段且必填
     /// </summary>
-    public EOrderTarget? ReportTarget { get; set; }
+    [SugarColumn(IsNullable = true)]
+    public string? ReportTargetCode { get; set; }
+
+    [SugarColumn(IsNullable = true)]
+    public string? ReportTarget { get; set; }
 
     #endregion
 }

src/Hotline/Settings/SysDicTypeConsts.cs

@@ -94,4 +94,14 @@ public class SysDicTypeConsts
     /// 专利类型
     /// </summary>
     public const string PatentType = "PatentType";
+
+    /// <summary>
+    /// 推送分类
+    /// </summary>
+    public const string PushType = "PushType";
+
+    /// <summary>
+    /// 事件对象
+    /// </summary>
+    public const string AffairTarget = "AffairTarget";
 }