Эх сурвалжийг харах

自贡任务 407 通讯记录各页面增加“工号”查询条件

tangjiang 1 сар өмнө
parent
commit
edff42edcd

+ 5 - 3
src/Hotline.Application/CallCenter/DefaultCallApplication.cs

@@ -108,7 +108,7 @@ public abstract class DefaultCallApplication : ICallApplication
     public virtual async Task<IReadOnlyList<TelGroupDto>> QueryGroupTel(CancellationToken cancellationToken)
     {
         var data = await _telGroupRepository.Queryable().Includes(d => d.Tels)
-         // .Select<TelGroupDto>()
+          // .Select<TelGroupDto>()
           .ToListAsync(cancellationToken);
         return _mapper.Map<IReadOnlyList<TelGroupDto>>(data);
     }
@@ -295,12 +295,13 @@ public abstract class DefaultCallApplication : ICallApplication
             .WhereIF(dto.IsMissOrder != null && dto.IsMissOrder.Value == true, (d, o, v) => string.IsNullOrEmpty(o.Id) == true)
             .WhereIF(dto.IsMissOrder != null && dto.IsMissOrder.Value == false, (d, o, v) => string.IsNullOrEmpty(o.Id) == false)
             .OrderByIF(dto.SortField.IsNullOrEmpty(), (d, o, v) => d.BeginIvrTime, OrderByType.Desc)
-            .OrderByIF(dto is { SortField: "waitduration", SortRule: 0 }, (d, o, v) =>  d.WaitDuration , OrderByType.Asc)
+            .OrderByIF(dto is { SortField: "waitduration", SortRule: 0 }, (d, o, v) => d.WaitDuration, OrderByType.Asc)
             .OrderByIF(dto is { SortField: "waitduration", SortRule: 1 }, (d, o, v) => d.WaitDuration, OrderByType.Desc);
 
         query = query.WhereIF(dto.Type == 3, (d, o, v) => d.AnsweredTime == null);
         query = query.WhereIF(dto.Type == 1, (d, o, v) => d.Direction == ECallDirection.In && d.AnsweredTime != null);
         query = query.WhereIF(dto.Type == 2, (d, o, v) => d.Direction == ECallDirection.Out && d.AnsweredTime != null);
+        query = query.WhereIF(dto.Type != 3 && !string.IsNullOrEmpty(dto.StaffNo), p => p.StaffNo == dto.StaffNo);
 
         if (dto.Type == 2)
         {
@@ -336,7 +337,8 @@ public abstract class DefaultCallApplication : ICallApplication
                         .Where(m => m.CallNo == d.CallNo && m.TelNo != "0")
                         .Max(m => m.TelNo)
                     ),
-            }, true);
+            }, true)
+                .WhereIF(!string.IsNullOrEmpty(dto.StaffNo), p => p.StaffNo == dto.StaffNo);
         }
         return query.Select((d, o, v) => new CallNativeDto
         {

+ 2 - 0
src/Hotline.Share/Dtos/CallCenter/QueryCallsFixedDto.cs

@@ -23,6 +23,8 @@ namespace Hotline.Share.Dtos.CallCenter
 
         public EEndBy? EndBy { get; set; }
 
+        public string? StaffNo {  get; set; }
+
         /// <summary>
         /// 呼入时间
         /// </summary>