Merge branch 'cd345、332' into release

src/Hotline.Api/Controllers/OrderController.cs

@@ -287,10 +287,12 @@ public class OrderController : BaseController
 			.WhereIF(dto.PubState == EPubState.Pub, d => d.Status >= EOrderStatus.Published)
             .WhereIF(dto.PubState == EPubState.NoPub, d => d.Status < EOrderStatus.Published)
             .WhereIF(!string.IsNullOrEmpty(dto.Channel), d => d.SourceChannelCode == dto.Channel)
-            .WhereIF(!string.IsNullOrEmpty(dto.TagNames), d => d.TagNames.Contains(dto.TagNames!)) //工单标签
+            .WhereIF(!string.IsNullOrEmpty(dto.OrderTag), d => d.OrderTagCode  == dto.OrderTag!) //工单标签
 			.WhereIF(!string.IsNullOrEmpty(dto.CenterToOrgHandlerName), d => d.CenterToOrgHandlerName == dto.CenterToOrgHandlerName! ) //派单人
 			.WhereIF(!string.IsNullOrEmpty(dto.NameOrNo), d => d.AcceptorName == dto.NameOrNo! || d.AcceptorStaffNo == dto.NameOrNo!) //受理人/坐席
 			.WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), d => d.ActualHandleOrgName.Contains(dto.ActualHandleOrgName)) //接办部门（综合查询模糊）
+            .WhereIF(!string.IsNullOrEmpty(dto.AcceptType), d => d.AcceptTypeCode == dto.AcceptType)//受理类型
+            .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.HotspotSpliceName != null && d.HotspotSpliceName.Contains(dto.Hotspot))
 			.WhereIF(!string.IsNullOrEmpty(dto.FromPhone), d => d.FromPhone == dto.FromPhone) //来电号码
             //.WhereIF(!string.IsNullOrEmpty(dto.PubMan),
             //    d => d.AcceptorName.Contains(dto.PubMan!) || d.AcceptorStaffNo.Contains(dto.PubMan!))
@@ -661,9 +663,9 @@ public class OrderController : BaseController
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.Order.CreationTime <= dto.CreationTimeEnd)
             .WhereIF(!string.IsNullOrEmpty(dto.FromPhone), d => d.Order.FromPhone == dto.FromPhone) //来电号码
             .WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), d => d.Order.ActualHandleOrgName.Contains(dto.ActualHandleOrgName)) //接办部门（综合查询模糊）
-            .WhereIF(dto.AcceptTypes.Any(), d => dto.AcceptTypes.Contains(d.Order.AcceptType))
-            .WhereIF(dto.HotspotIds.Any(), d => dto.HotspotIds.Contains(d.Order.HotspotId))
-            .WhereIF(!string.IsNullOrEmpty(dto.PublishName), d => d.CreatorName.Contains(dto.PublishName!))
+			.WhereIF(!string.IsNullOrEmpty(dto.AcceptType), d => d.Order.AcceptTypeCode == dto.AcceptType)//受理类型
+            .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.Order.HotspotSpliceName != null && d.Order.HotspotSpliceName.Contains(dto.Hotspot))
+			.WhereIF(!string.IsNullOrEmpty(dto.PublishName), d => d.CreatorName.Contains(dto.PublishName!))
             .WhereIF(!string.IsNullOrEmpty(dto.NameOrNo), d => d.Order.AcceptorName == dto.NameOrNo! || d.Order.AcceptorStaffNo == dto.NameOrNo!) //受理人/坐席
             .WhereIF(dto.StartTime.HasValue, d => d.CreationTime >= dto.StartTime)
             .WhereIF(dto.EndTime.HasValue, d => d.CreationTime <= dto.EndTime)
@@ -5764,7 +5766,7 @@ public class OrderController : BaseController
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    [HttpGet("order_observe/list/export")]
+    [HttpPost("order_observe/list/export")]
 	public async Task<FileStreamResult> ListExport([FromBody] ExportExcelDto<OrderObserveListDto> dto)
     {
 	    var query = _orderApplication.OrderObserveList(dto.QueryDto);

src/Hotline.Share/Dtos/Order/Publish/QueryOrderPublishDto.cs

@@ -40,6 +40,17 @@ public record QueryOrderPublishDto : PagedKeywordRequest
 	/// </summary>
 	public List<string>? AcceptTypes { get; set; } = new();
 
+
+	/// <summary>
+	/// 受理类型（√）
+	/// </summary>
+	public string? AcceptType { get; set; }
+
+	/// <summary>
+	/// 热点分类关键词
+	/// </summary>
+	public string? Hotspot { get; set; }
+
 	/// <summary>
 	/// 热点分类
 	/// </summary>
@@ -69,7 +80,7 @@ public record QueryOrderPublishDto : PagedKeywordRequest
     /// <summary>
     /// 工单标签
     /// </summary>
-    public string? TagNames { get; set; }
+    public string? OrderTag { get; set; }
 
 	/// <summary>
 	/// 归档方式

src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -201,19 +201,19 @@ public record PublishedPagedRequest : PagedKeywordRequest
     public string? ActualHandleOrgName { get; set; }
 
     /// <summary>
-    /// 受理类型
+    /// 受理类型（√）
     /// </summary>
-    public List<string>? AcceptTypes { get; set; } = new();
+    public string? AcceptType { get; set; }
 
     /// <summary>
-    /// 热点分类
+    /// 热点分类关键词
     /// </summary>
-    public List<string>? HotspotIds { get; set; } = new();
+    public string? Hotspot { get; set; }
 
-    /// <summary>
-    /// 受理坐席名字或工号（×）
-    /// </summary>
-    public string? NameOrNo { get; set; }
+	/// <summary>
+	/// 受理坐席名字或工号（×）
+	/// </summary>
+	public string? NameOrNo { get; set; }
 
     /// <summary>
     /// 发布人名称