Merge branch 'master' into tangj-knowledge

src/Hotline.Api/Controllers/OrderController.cs

@@ -21,6 +21,7 @@ public class OrderController : BaseController
     private readonly IOrderRepository _orderRepository;
     private readonly IWorkflowApplication _workflowApplication;
     private readonly IWorkflowDomainService _workflowDomainService;
+    private readonly IHotSpotTypeRepository _hotSpotTypeRepository;
     private readonly IMapper _mapper;
 
     public OrderController(
@@ -28,12 +29,14 @@ public class OrderController : BaseController
         IOrderRepository orderRepository,
         IWorkflowApplication workflowApplication,
         IWorkflowDomainService workflowDomainService,
+        IHotSpotTypeRepository hotSpotTypeRepository,
         IMapper mapper)
     {
         _orderDomainService = orderDomainService;
         _orderRepository = orderRepository;
         _workflowApplication = workflowApplication;
         _workflowDomainService = workflowDomainService;
+        _hotSpotTypeRepository= hotSpotTypeRepository;
         _mapper = mapper;
     }
 
@@ -132,4 +135,16 @@ public class OrderController : BaseController
             //CountersignMode = EnumExts.GetDescriptions<ECountersignMode>().Where(d => d.Key != 1)
         };
     }
+
+    /// <summary>
+    /// 获取热点
+    /// </summary>
+    /// <param name="parentId">父级ID</param>
+    /// <returns></returns>
+    [HttpGet("hotspottype-list-parent")]
+    public async Task<List<HotSpotType>> GetHotSpotType(string? parentId)
+    {
+       return await _hotSpotTypeRepository.Queryable().Where(x => x.ParentId == parentId).ToListAsync();
+    }
+
 }

src/Hotline/Orders/HotSpotType.cs

@@ -7,13 +7,14 @@ namespace Hotline.Orders
     /// <summary>
     /// 热点基础数据
     /// </summary>
-    [SugarIndex("unique_hotspottype_name", nameof(HotSpotType.HotSpotName), OrderByType.Desc, true)]
     public class HotSpotType: CreationSoftDeleteEntity
     {
         public string HotSpotName { get; set; }
         [SugarColumn(IsNullable = true)]
         public string ParentId { get; set; }
+        [SugarColumn(IsNullable = true)]
         public string PYCode { get; set; }
+        [SugarColumn(IsNullable = true)]
         public string FullPYCode { get; set; }
         public string ProvinceCode { get; set; }
         public int OrderBy { get; set; }

src/XF.Domain/Constants/SettingConstants.cs

@@ -14,43 +14,8 @@ namespace XF.Domain.Constants
         public const string IVRConfig = "IVRConfig";
 
         /// <summary>
-        /// 时段定义
+        /// 是否小休审批
         /// </summary>
-        public const string TimeOrder = "TimeOrder";
-
-        /// <summary>
-        /// 工作日定义
-        /// </summary>
-        public const string WorkTimeSetting = "WorkTimeSetting";
-
-        /// <summary>
-        /// 工作时段语音导航
-        /// </summary>
-        public const string WorkCategory = "WorkCategory";
-
-        /// <summary>
-        /// 休息时段语音导航
-        /// </summary>
-        public const string RestCategory = "RestCategory";
-
-        /// <summary>
-        /// 上午开始时间
-        /// </summary>
-        public const string MorningBegin = "MorningBegin";
-
-        /// <summary>
-        /// 上午结束时间
-        /// </summary>
-        public const string MorningEnd = "MorningEnd";
-
-        /// <summary>
-        /// 下午开始时间
-        /// </summary>
-        public const string AfterBegin = "AfterBegin";
-
-        /// <summary>
-        /// 下午结束时间
-        /// </summary>
-        public const string AfterEnd = "AfterEnd";
+        public const string RestApproval = "RestApproval";
     }
 }