Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -28,6 +28,7 @@ public class OrderController : BaseController
     private readonly IWorkflowApplication _workflowApplication;
     private readonly IWorkflowDomainService _workflowDomainService;
     private readonly IHotSpotTypeRepository _hotSpotTypeRepository;
+    private readonly ISystemDomainService _systemDomainService;
     private readonly ISystemOrganizeRepository _organizeRepository;
     private readonly IMapper _mapper;
 
@@ -37,6 +38,7 @@ public class OrderController : BaseController
         IWorkflowApplication workflowApplication,
         IWorkflowDomainService workflowDomainService,
         IHotSpotTypeRepository hotSpotTypeRepository,
+        ISystemDomainService systemDomainService,
         ISystemOrganizeRepository organizeRepository,
         IMapper mapper)
     {
@@ -45,6 +47,7 @@ public class OrderController : BaseController
         _workflowApplication = workflowApplication;
         _workflowDomainService = workflowDomainService;
         _hotSpotTypeRepository = hotSpotTypeRepository;
+        _systemDomainService = systemDomainService;
         _organizeRepository = organizeRepository;
         _mapper = mapper;
     }
@@ -198,12 +201,11 @@ public class OrderController : BaseController
             GenderOptions = EnumExts.GetDescriptions<EGender>(),
             IdentityTypeOptions = EnumExts.GetDescriptions<EIdentityType>(),
             LicenceTypeOptions = EnumExts.GetDescriptions<ELicenceType>(),
-            //AgeRangeOptions = 
+            AgeRangeOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.AgeRange),
             OrderTypeOptions = EnumExts.GetDescriptions<EOrderType>(),
             AcceptTypeOptions = EnumExts.GetDescriptions<EAcceptType>(),
             EmergencyLevelOptions = EnumExts.GetDescriptions<EEmergencyLevel>(),
             PushTypeOptions = EnumExts.GetDescriptions<EPushType>(),
-            //todo 是否重复
         };
     }
 
@@ -214,10 +216,20 @@ public class OrderController : BaseController
     [HttpGet("base-data-ext")]
     public dynamic BaseDataExtension()
     {
-        //todo
         return new
         {
-            //LicenceTypeOptions = SysDicTypeConsts.LicenceType,
+            LicenceTypeOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.LicenceType),
+            IdentityTypeOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.ProviderIdentityType),
+            IdentityOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.Identity),
+            NationalityOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.Nationality),
+            NationOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.Nation),
+            MarketTypeOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.MarketType),
+            IndustryClassifyOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.IndustryClassify),
+            BrandOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.Brand),
+            ObjectClassifyOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.ObjectClassify),
+            ComplainClassifyOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.ComplainClassify),
+            SalesModeOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.SalesMode),
+            ECommercePlatformOptions = _systemDomainService.GetSysDicDataByCode(SysDicTypeConsts.ECommercePlatform),
             ComplainTypeOptions = EnumExts.GetDescriptions<EComplainType>()
         };
     }

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

@@ -1,39 +1,48 @@
-namespace Hotline.Share.Enums.Order;
+using System.ComponentModel;
+
+namespace Hotline.Share.Enums.Order;
 
 /// <summary>
 /// 受理类型
 /// </summary>
 public enum EAcceptType
 {
+    [Description("其他")]
     Other = 0,
 
     /// <summary>
     /// 咨询
     /// </summary>
+    [Description("咨询")]
     Consult = 1,
 
     /// <summary>
     /// 建议
     /// </summary>
+    [Description("建议")]
     Suggest = 2,
 
     /// <summary>
     /// 求助
     /// </summary>
+    [Description("求助")]
     SeekHelp = 3,
 
     /// <summary>
     /// 表扬
     /// </summary>
+    [Description("表扬")]
     Praise = 4,
 
     /// <summary>
     /// 举报
     /// </summary>
+    [Description("举报")]
     Report = 5,
 
     /// <summary>
     /// 投诉
     /// </summary>
+    [Description("投诉")]
     Complain = 6,
 }

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

@@ -1,27 +1,34 @@
-namespace Hotline.Share.Enums.Order;
+using System.ComponentModel;
+
+namespace Hotline.Share.Enums.Order;
 
 public enum EChannel
 {
     /// <summary>
     /// 电话
     /// </summary>
+    [Description("电话")]
     Phone = 0,
 
     /// <summary>
     /// 门户网站
     /// </summary>
+    [Description("门户网站")]
     Web = 1,
 
     /// <summary>
     /// 微信小程序
     /// </summary>
+    [Description("微信小程序")]
     WxMiniProgram = 2,
 
     /// <summary>
     /// 微信公众号
     /// </summary>
+    [Description("微信公众号")]
     WxOfficial = 3,
 
+    [Description("App")]
     App = 4,
 
 

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

@@ -1,4 +1,6 @@
-namespace Hotline.Share.Enums.Order;
+using System.ComponentModel;
+
+namespace Hotline.Share.Enums.Order;
 
 /// <summary>
 /// 紧急程度
@@ -8,20 +10,24 @@ public enum EEmergencyLevel
     /// <summary>
     /// 不紧急
     /// </summary>
+    [Description("不紧急")]
     UnEmergency = 0,
 
     /// <summary>
     /// 一般
     /// </summary>
+    [Description("一般")]
     Normal = 1,
 
     /// <summary>
     /// 紧急
     /// </summary>
+    [Description("紧急")]
     Emergency = 2,
 
     /// <summary>
     /// 非常紧急
     /// </summary>
+    [Description("非常紧急")]
     QuiteEmergency = 3,
 }

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

@@ -1,29 +1,36 @@
-namespace Hotline.Share.Enums.Order;
+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/EOrderType.cs

@@ -1,4 +1,6 @@
-namespace Hotline.Share.Enums.Order;
+using System.ComponentModel;
+
+namespace Hotline.Share.Enums.Order;
 
 /// <summary>
 /// 工单类型
@@ -8,10 +10,12 @@ public enum EOrderType
     /// <summary>
     /// 通用工单
     /// </summary>
+    [Description("通用工单")]
     Common = 0,
 
     /// <summary>
     /// 12315市场监管局受理单
     /// </summary>
+    [Description("12315市场监管局受理单")]
     MarketSupervisionBy12315 = 1,
 }

src/Hotline/Settings/ISysDicDataDomainRepository.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Hotline.Settings
-{
-    public interface ISysDicDataDomainRepository
-    {
-        Task<IReadOnlyList<SysDicData>> GetSysDicDataByCode(string code);
-    }
-}

src/Hotline/Settings/ISystemDomainService.cs

@@ -15,5 +15,7 @@ namespace Hotline.Settings
         /// <returns></returns>
         Task<IEnumerable<KeyValuePair<int, string>>> QueryOrgLevelOptionsAsync(CancellationToken cancellationToken);
         Task<IEnumerable<KeyValuePair<string, string>>> QueryOrgLevelStringOptionsAsync(CancellationToken cancellationToken);
+
+        Task<IReadOnlyList<SysDicData>> GetSysDicDataByCode(string code);
     }
 }

src/Hotline/Settings/SysDicDataDomainRepository.cs

@@ -1,18 +0,0 @@
-using XF.Domain.Dependency;
-
-namespace Hotline.Settings
-{
-    public class SysDicDataDomainRepository : ISysDicDataDomainRepository, IScopeDependency
-    {
-        private readonly ISysDicDataRepository _sysDicDataRepository;
-        public SysDicDataDomainRepository(ISysDicDataRepository sysDicDataRepository)
-        {
-            _sysDicDataRepository = sysDicDataRepository;
-        }
-
-        public async Task<IReadOnlyList<SysDicData>> GetSysDicDataByCode(string code)
-        {
-            return await _sysDicDataRepository.Queryable().Where(x => x.DicTypeCode == code).ToTreeAsync(x => x.Children, x => x.ParentId, "");
-        }
-    }
-}

src/Hotline/Settings/SystemDomainService.cs

@@ -5,10 +5,14 @@ namespace Hotline.Settings;
 public class SystemDomainService : ISystemDomainService, IScopeDependency
 {
     private readonly ISystemOrganizeRepository _organizeRepository;
+    private readonly ISysDicDataRepository _sysDicDataRepository;
 
-    public SystemDomainService(ISystemOrganizeRepository organizeRepository)
+    public SystemDomainService(
+        ISystemOrganizeRepository organizeRepository,
+        ISysDicDataRepository sysDicDataRepository)
     {
         _organizeRepository = organizeRepository;
+        _sysDicDataRepository = sysDicDataRepository;
     }
 
     public async Task<IEnumerable<KeyValuePair<int, string>>> QueryOrgLevelOptionsAsync(CancellationToken cancellationToken)
@@ -30,4 +34,9 @@ public class SystemDomainService : ISystemDomainService, IScopeDependency
         var rsp = await QueryOrgLevelOptionsAsync(cancellationToken);
         return rsp.Select(d => new KeyValuePair<string, string>(d.Key.ToString(), d.Value));
     }
+
+    public async Task<IReadOnlyList<SysDicData>> GetSysDicDataByCode(string code)
+    {
+        return await _sysDicDataRepository.Queryable().Where(x => x.DicTypeCode == code).ToTreeAsync(x => x.Children, x => x.ParentId, "");
+    }
 }