src/Hotline.Api/Controllers/AiController.cs

@@ -1002,8 +1002,8 @@ namespace Hotline.Api.Controllers
             var items= await _orderVisitRepository.Queryable()
                 .Includes(x=>x.Order)
                 .Where(x => x.VisitState == Share.Enums.Order.EVisitState.WaitForVisit && x.IsCanAiVisit == true && x.EmployeeId == _sessionContext.RequiredUserId)
-                .WhereIF(dto.HotspotIds.Any(), x => dto.HotspotIds.Contains(x.Order.HotspotId)) //热点类型
-                .WhereIF(dto.AcceptTypes.Any(), x => dto.AcceptTypes.Contains(x.Order.AcceptTypeCode)) //受理类型
+                .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.Order.HotspotSpliceName != null && d.Order.HotspotSpliceName.Contains(dto.Hotspot))//热点类型
+                .WhereIF(!string.IsNullOrEmpty(dto.AcceptType), d => d.Order.AcceptTypeCode == dto.AcceptType)//受理类型
                 .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.No.Contains(dto.No)) //工单编码
                 .WhereIF(!string.IsNullOrEmpty(dto.Title),x=> x.Order.Title.Contains(dto.Title))
                 .ToListAsync();

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -2081,9 +2081,9 @@ namespace Hotline.Api.Controllers.Bi
                 .Where(x => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
                 .Where(x => filterTitle.Any(s => x.Title.Contains(s)) == false)
                 .LeftJoin<SystemArea>((it, o) => it.AreaCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")) == o.Id)
-                .WhereIF(dto.AreaCodes.Any(), (it, o) => dto.AreaCodes.Contains(it.AreaCode)) //区域
-                .WhereIF(dto.HotspotIds.Any(), (it, o) => dto.HotspotIds.Contains(it.HotspotId)) //热点类型
-                .WhereIF(dto.AcceptTypeCodes.Any(), (it, o) => dto.AcceptTypeCodes.Contains(it.AcceptTypeCode)) //受理类型
+                .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.AreaCode), d => d.AreaCode == dto.AreaCode)//区域
                 .GroupBy((it, o) => new
                 {
                     it.AcceptTypeCode,

src/Hotline.Api/Controllers/OrderController.cs

@@ -961,9 +961,9 @@ public class OrderController : BaseController
             .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.No == dto.No)
             .WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Order.Title.Contains(dto.Title))
             .WhereIF(!string.IsNullOrEmpty(dto.VisitUserName), x => x.Employee.Name.Contains(dto.VisitUserName))
-            .WhereIF(dto.AcceptTypes.Any(), d => dto.AcceptTypes.Contains(d.Order.AcceptTypeCode)) //受理类型
-            .WhereIF(dto.HotspotIds.Any(), d => dto.HotspotIds.Contains(d.Order.HotspotId)) //热点类型
-            .WhereIF(dto.OrgCodes.Any(), d => dto.OrgCodes.Contains(d.Order.ActualHandleOrgCode)) //接办部门
+            .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.OrgName), d => d.Order.CurrentHandleOrgName == dto.OrgName)//接办部门
             .WhereIF(!string.IsNullOrEmpty(dto.NameOrNo),
                 d => d.Order.AcceptorName.Contains(dto.NameOrNo!) || d.Order.AcceptorStaffNo.Contains(dto.NameOrNo!)) //受理人/坐席
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart) //受理时间开始

src/Hotline.Api/Controllers/WorkflowController.cs

@@ -562,9 +562,9 @@ public class WorkflowController : BaseController
             .InnerJoin<Order>((c, w, o) => w.ExternalId == o.Id)
             .WhereIF(!string.IsNullOrEmpty(dto.Title), (c, w, o) => o.Title.Contains(dto.Title))
             .WhereIF(!string.IsNullOrEmpty(dto.OrderNo), (c, w, o) => o.No == dto.OrderNo)
-            .WhereIF(dto.AcceptTypes.Any(), (c, w, o) => dto.AcceptTypes.Contains(o.AcceptTypeCode)) //受理类型
-            .WhereIF(dto.Channels.Any(), (c, w, o) => dto.Channels.Contains(o.SourceChannelCode)) //来源渠道
-            .WhereIF(dto.HotspotIds.Any(), (c, w, o) => dto.HotspotIds.Contains(o.HotspotId)) //热点类型
+            .WhereIF(!string.IsNullOrEmpty(dto.AcceptType), (c, w, o) => o.AcceptTypeCode == dto.AcceptType)//受理类型
+            .WhereIF(!string.IsNullOrEmpty(dto.Channel), (c, w, o) => o.SourceChannelCode == dto.Channel)//受理类型
+            .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), (c, w, o) => o.HotspotSpliceName != null && o.HotspotSpliceName.Contains(dto.Hotspot))//热点类型
             .WhereIF(!string.IsNullOrEmpty(dto.OrgName), (c, w, o) => c.FinisherOrgName.Contains(dto.OrgName)) //接办部门
             .WhereIF(dto.CounterSignType != null, (c, w, o) => c.CounterSignType == dto.CounterSignType) //会签类型
         ;

src/Hotline.Application/Orders/OrderApplication.cs

@@ -496,10 +496,10 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No == dto.No) //工单编码
             .WhereIF(!string.IsNullOrEmpty(dto.AcceptType), d => d.AcceptTypeCode == dto.AcceptType)//受理类型
             //.WhereIF(dto.AcceptTypes.Any(), d => dto.AcceptTypes.Contains(d.AcceptTypeCode)) //受理类型
-            .WhereIF(!string.IsNullOrEmpty(dto.Channel), d=> d.SourceChannelCode == dto.Channel)
-            //.WhereIF(dto.Channels.Any(), d => dto.Channels.Contains(d.SourceChannelCode)) //来源渠道
-                                                                                          //.WhereIF(dto.HotspotIds.Any(), d => dto.HotspotIds.Contains(d.HotspotId)) //热点类型
-            .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.HotspotSpliceName != null && d.HotspotSpliceName.Contains(dto.Hotspot))
+            .WhereIF(!string.IsNullOrEmpty(dto.Channel), d=> d.SourceChannelCode == dto.Channel)//受理类型
+                                                                                                //.WhereIF(dto.Channels.Any(), d => dto.Channels.Contains(d.SourceChannelCode)) //来源渠道
+                                                                                                //.WhereIF(dto.HotspotIds.Any(), d => dto.HotspotIds.Contains(d.HotspotId)) //热点类型
+            .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.HotspotSpliceName != null && d.HotspotSpliceName.Contains(dto.Hotspot))//热点类型
             .WhereIF(!string.IsNullOrEmpty(dto.TransferPhone), d => d.TransferPhone == dto.TransferPhone!) //转接号码
                                                                                                            //.WhereIF(dto.OrgCodes.Any(), d => d.Workflow.Assigns.Any(s => dto.OrgCodes.Contains(s.OrgCode)))
             //.WhereIF(dto.OrgCodes.Any(), d => dto.OrgCodes.Contains(d.ActualHandleOrgCode)) //接办部门

src/Hotline.Share/Dtos/Ai/AiDto.cs

@@ -424,12 +424,12 @@ namespace Hotline.Share.Dtos.Ai
         /// <summary>
         /// 热点分类
         /// </summary>
-        public List<string> HotspotIds { get; set; } = new();
+        public string Hotspot { get; set; }
 
         /// <summary>
         /// 受理类型
         /// </summary>
-        public List<string> AcceptTypes { get; set; } = new();
+        public string AcceptType { get; set; }
     }
 
 

src/Hotline.Share/Dtos/Bi/BiOrderDto.cs

@@ -31,11 +31,11 @@ namespace Hotline.Share.Dtos.Bi
         public DateTime StartTime { get; set; }
         public DateTime EndTime { get; set; }
 
-        public List<string> HotspotIds { get; set; } = new();
+        public string Hotspot { get; set; }
 
-        public List<string> AreaCodes { get; set; } = new();
+        public string AreaCode { get; set; }
 
-        public List<string> AcceptTypeCodes { get; set; } = new();
+        public string AcceptType { get; set; }
     }
 
     public record HighMatterWarningDetailRequest : PagedRequest

src/Hotline.Share/Dtos/FlowEngine/Workflow/QueryWorkflowCountersignDto.cs

@@ -40,12 +40,12 @@ namespace Hotline.Share.Dtos.FlowEngine.Workflow
         /// <summary>
         /// 受理类型（√）
         /// </summary>
-        public List<string> AcceptTypes { get; set; } = new();
+        public string AcceptType { get; set; }
 
         /// <summary>
         /// 来源渠道（√）
         /// </summary>
-        public List<string> Channels { get; set; } = new();
+        public string Channel { get; set; }
 
         /// <summary>
         /// 会签类型
@@ -60,6 +60,6 @@ namespace Hotline.Share.Dtos.FlowEngine.Workflow
         /// <summary>
         /// 热点分类（√）
         /// </summary>
-        public List<string> HotspotIds { get; set; } = new();
+        public string Hotspot { get; set; }
     }
 }

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

@@ -11,7 +11,7 @@ using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.Order
 {
-    public record CanLinkCallRecordOrderVisitDto:PagedKeywordRequest
+    public record CanLinkCallRecordOrderVisitDto : PagedKeywordRequest
     {
 
     }
@@ -53,9 +53,9 @@ namespace Hotline.Share.Dtos.Order
         /// 是否省工单
         /// </summary>
         public bool? IsProvince { get; set; }
-	}
+    }
 
-    public record VisitJudgeQueryReq:PagedKeywordRequest
+    public record VisitJudgeQueryReq : PagedKeywordRequest
     {
         /// <summary>
         /// 工单编号
@@ -77,17 +77,17 @@ namespace Hotline.Share.Dtos.Order
         /// <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 List<string> OrgCodes { get; set; } = new();
+        public string OrgName { get; set; }
 
         /// <summary>
         /// 受理坐席名字或工号
@@ -505,7 +505,7 @@ namespace Hotline.Share.Dtos.Order
         public EJudgeState? JudgeState { get; set; }
 
         public string? JudgeStateText => JudgeState?.GetDescription() ?? string.Empty;
-        
+
         /// <summary>
         /// 评判意见
         /// </summary>
@@ -564,15 +564,15 @@ namespace Hotline.Share.Dtos.Order
 
         public string OrgProcessingResultsText => !(OrgProcessingResults is null) ? OrgProcessingResults.Value : "";
 
-		/// <summary>
-		/// 不满意原因
-		/// </summary>
-		public List<Kv>? OrgNoSatisfiedReason { get; set; }
+        /// <summary>
+        /// 不满意原因
+        /// </summary>
+        public List<Kv>? OrgNoSatisfiedReason { get; set; }
 
         /// <summary>
         /// 不满意原因字符串
         /// </summary>
-        public string OrgNoSatisfiedReasonText =>  OrgNoSatisfiedReason != null ?  string.Join(',', OrgNoSatisfiedReason.Select(d=>d.Value)) : "";
+        public string OrgNoSatisfiedReasonText => OrgNoSatisfiedReason != null ? string.Join(',', OrgNoSatisfiedReason.Select(d => d.Value)) : "";
 
         /// <summary>
         /// 部门办件态度
@@ -740,7 +740,7 @@ namespace Hotline.Share.Dtos.Order
         /// 回访内容
         /// </summary>
         public string? VisitContent { get; set; }
-      
+
     }