Browse Source

任务 486 回访待办新增查询条件(泸州+自贡)

tangjiang 2 weeks ago
parent
commit
0c493722e4

+ 4 - 2
src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -1435,8 +1435,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         }
         if (dto.IsTransact.HasValue && dto.IsTransact.Value)
         {
-			visit.Order.VisitReTransactNum = visit.Order.VisitReTransactNum is null ? 1 : visit.Order.VisitReTransactNum + 1;
-		}
+            visit.Order.VisitReTransactNum = visit.Order.VisitReTransactNum is null ? 1 : visit.Order.VisitReTransactNum + 1;
+        }
 
         await _orderVisitRepository.UpdateAsync(visit, cancellationToken);
         await _orderVisitedDetailRepository.UpdateRangeAsync(visit.OrderVisitDetails, cancellationToken);
@@ -3911,6 +3911,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                     .Where((s, p) => p.DicDataValue == dto.OrderTagCode && d.OrderId == s.OrderId).Any()) //工单标签
             .WhereIF(dto.IsUpdate.HasValue && dto.IsUpdate == true, d => d.IsUpdate == true)
             .WhereIF(dto.IsUpdate.HasValue && dto.IsUpdate == false, d => d.IsUpdate == false || d.IsUpdate == null)
+            .WhereIF(dto.IsEmployeeNameNull.HasValue && dto.IsEmployeeNameNull == true, d => d.EmployeeId != null && d.EmployeeId != "")
+            .WhereIF(dto.IsEmployeeNameNull.HasValue && dto.IsEmployeeNameNull == false, d => d.EmployeeId == null || d.EmployeeId == "")
 
             .OrderByIF(_appOptions.Value.IsYiBin && dto.VisitStateQuery != EVisitStateQuery.Visited, d => d.Order.IsUrgent, OrderByType.Desc)
             .OrderByIF(_appOptions.Value.IsZiGong == false, d => d.PublishTime, OrderByType.Desc)

+ 5 - 0
src/Hotline.Share/Dtos/Order/OrderVisitDto.cs

@@ -153,6 +153,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public bool? IsUpdate { get; set; }
 
+        /// <summary>
+        /// 回访人是否为空
+        /// </summary>
+        public bool? IsEmployeeNameNull { get; set;}
+
     }
 
     public record QueryOrderPublishStatisticsAllDto : PagedRequest