浏览代码

Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

qinchaoyue 3 月之前
父节点
当前提交
4ce3897b6f

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

@@ -299,6 +299,8 @@ public abstract class DefaultCallApplication : ICallApplication
             .WhereIF(!string.IsNullOrEmpty(dto.StaffNo), d => d.StaffNo == dto.StaffNo)
             .WhereIF(!string.IsNullOrEmpty(dto.GroupId), d => d.GroupId == dto.GroupId)
             .WhereIF(dto.OperateState != null, d => d.OperateState == dto.OperateState)
+            .WhereIF(dto.OperateTimeStart.HasValue, x => x.OperateTime >= dto.OperateTimeStart)
+            .WhereIF(dto.OperateTimeEnd.HasValue, x => x.OperateTime <= dto.OperateTimeEnd)
             .OrderByDescending(d => d.Id)
             .ToFixedListAsync(dto, cancellationToken);
     }
@@ -597,7 +599,7 @@ public abstract class DefaultCallApplication : ICallApplication
             TrCallRecordDto = call.Adapt<TrCallDto>()
         }, cancellationToken: cancellationToken);
         var msg = $"原CallId: {orderCall.CallId}, 更新CallId: {call.Id}";
-        _systemLogRepository.Add("延迟更新工单通话", orderId, msg,status:1, ipUrl: orderCall.CallId);
+        _systemLogRepository.Add("延迟更新工单通话", orderId, msg, status: 1, ipUrl: orderCall.CallId);
         return msg + "(完成推省上)";
     }
 

+ 10 - 0
src/Hotline.Share/Dtos/CallCenter/QueryTelOperationsFixedDto.cs

@@ -28,5 +28,15 @@ namespace Hotline.Share.Dtos.CallCenter
         /// 操作类型
         /// </summary>
         public int? OperateState { get; set; }
+
+        /// <summary>
+        /// 动作开始时间Star
+        /// </summary>
+        public DateTime? OperateTimeStart { get; set; }
+
+        /// <summary>
+        /// 动作开始时间End
+        /// </summary>
+        public DateTime? OperateTimeEnd { get; set; }
     }
 }