Merge branch 'dev' of http://git.12345lm.cn/Fengwo/hotline into dev

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

@@ -2531,8 +2531,15 @@ namespace Hotline.Api.Controllers.Bi
 
             dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
 
+            List<string> filterTitle = new List<string>();
+            filterTitle.Add("无声");
+            filterTitle.Add("骚扰");
+            filterTitle.Add("错拨");
+            filterTitle.Add("测试");
+
             var (total, items) = await _orderRepository.Queryable()
                 .Where(x => x.CreationTime >= dto.StartDate && x.CreationTime <= dto.EndDate)
+                .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)) //热点类型
@@ -2587,6 +2594,12 @@ namespace Hotline.Api.Controllers.Bi
         public async Task<PagedDto<OrderDto>> HighMatterWarningDetail([FromQuery] HighMatterWarningDetailRequest dto)
         {
             dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
+            List<string> filterTitle = new List<string>();
+            filterTitle.Add("无声");
+            filterTitle.Add("骚扰");
+            filterTitle.Add("错拨");
+            filterTitle.Add("测试");
+
             var (total, items) = await _orderRepository.Queryable()
             .Includes(x => x.OrderScreens)
             .Where(d => d.AcceptTypeCode == dto.AcceptTypeCode) //受理类型
@@ -2594,6 +2607,7 @@ namespace Hotline.Api.Controllers.Bi
             .Where(d => d.CreationTime >= dto.StartDate) //受理时间开始
             .Where(d => d.CreationTime <= dto.EndDate) //受理时间结束
             .Where(d => d.AreaCode == dto.AreaCode) //区域
+            .Where(x => filterTitle.Any(s => x.Title.Contains(s)) == false)
             .OrderByDescending(d => d.CreationTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
             return new PagedDto<OrderDto>(total, _mapper.Map<IReadOnlyList<OrderDto>>(items));