Merge branch 'feature/snapshot' into dev

src/Hotline.Application/Snapshot/SnapshotOrderApplication.cs

@@ -436,10 +436,31 @@ public class SnapshotOrderApplication : IOrderSnapshotApplication, IScopeDepende
     {
         var query = _orderSnapshotRepository.Queryable()
             .LeftJoin<Order>((snapshot, order) => snapshot.Id == order.Id)
+            .LeftJoin<Industry>((snapshot, order, industry) => snapshot.IndustryId == industry.Id)
             .WhereIF(dto.No.NotNullOrEmpty(), (snapshot, order) => order.No.Contains(dto.No))
             .WhereIF(dto.Title.NotNullOrEmpty(), (snapshot, order) => order.Title.Contains(dto.Title))
             .WhereIF(dto.ActualHandleOrgName.NotNullOrEmpty(), (snapshot, order) => order.ActualHandleOrgName.Contains(dto.ActualHandleOrgName))
-            .Select((snapshot, order) => new OrderSnapshotItemsOutDto
+            .WhereIF(dto.AcceptType.NotNullOrEmpty(), (snapshot, order) => order.AcceptType == dto.AcceptType)
+            .WhereIF(dto.AcceptorName.NotNullOrEmpty(), (snapshot, order) => order.AcceptorName == dto.AcceptorName)
+            .WhereIF(dto.FromPhone.NotNullOrEmpty(), (snapshot, order) => order.FromPhone == dto.FromPhone)
+            .WhereIF(dto.FromName.NotNullOrEmpty(), (snapshot, order) => order.FromName == dto.FromName)
+            .WhereIF(dto.BeginExpiredTime.HasValue && dto.EndExpiredTime.HasValue, (snapshot, order) => order.ExpiredTime >= dto.BeginExpiredTime && order.ExpiredTime <= dto.EndExpiredTime)
+            .WhereIF(dto.BeginCreationTime.HasValue && dto.EndCreationTime.HasValue, (snapshot, order) => order.CreationTime >= dto.BeginCreationTime && order.CreationTime <= dto.EndCreationTime)
+            .WhereIF(dto.Status.HasValue, (snapshot, order) => order.Status == dto.Status)
+            .WhereIF(dto.County.NotNullOrEmpty(), (snapshot, order) => order.County == dto.County)
+            .WhereIF(dto.IsScreen.HasValue && dto.IsScreen == true, (snapshot, order) => order.OrderScreens.Count() > 0)
+            .WhereIF(dto.IsScreen.HasValue && dto.IsScreen == false, (snapshot, order) => order.OrderScreens.Count() == 0)
+            .WhereIF(dto.CurrentStepName.NotNullOrEmpty(), (snapshot, order) => order.CurrentStepName == dto.CurrentStepName)
+            .WhereIF(dto.BeginFiledTime.HasValue && dto.EndFiledTime.HasValue, (snapshot, order) => order.FiledTime >= dto.BeginFiledTime && order.FiledTime <= dto.EndFiledTime)
+            .WhereIF(dto.HotspotName.NotNullOrEmpty(), (snapshot, order) => order.HotspotName.Contains(dto.HotspotName))
+            .WhereIF(dto.OrderTagCode.NotNullOrEmpty(), (snapshot, order) => order.OrderTagCode.Contains(dto.OrderTagCode))
+            .WhereIF(dto.IsUrgent.HasValue, (snapshot, order) => order.IsUrgent == dto.IsUrgent)
+            .WhereIF(dto.TransferPhone.NotNullOrEmpty(), (snapshot, order) => order.TransferPhone.Contains(dto.TransferPhone))
+            .WhereIF(dto.OrgLevelOneCode.NotNullOrEmpty(), (snapshot, order) => order.OrgLevelOneCode == dto.OrgLevelOneCode)
+            //.WhereIF(dto.DiscontentTurnTo.HasValue, (snapshot, order) => order == dto.OrgLevelOneCode)
+            .WhereIF(dto.IndustryId.NotNullOrEmpty(), (snapshot, order) => snapshot.IndustryId == dto.IndustryId)
+            .WhereIF(dto.IsElectric.HasValue, (snapshot, order, industry) => industry.IndustryType == EIndustryType.Declare)
+            .Select((snapshot, order, industry) => new OrderSnapshotItemsOutDto
             {
                 CreationTime = order.CreationTime
             }
@@ -486,4 +507,5 @@ public class SnapshotOrderApplication : IOrderSnapshotApplication, IScopeDepende
         }
         return await _orderSnapshotRepository.UpdateSafetyAsync(orderId, isSafetyDepartment, remark);
     }
+
 }

src/Hotline.Share/Dtos/Snapshot/OrderDto.cs

@@ -1811,16 +1811,17 @@ public class LabelOrderSnapshotLogItemsOutDto
     /// 标注时间
     /// </summary>
     public DateTime LabelTime { get; set; }
+
 }
 
 public record OrderSnapshotItemsInDto : PagedRequest
 {
-    /// <summary>
-    /// 资金状态
-    /// 0: 全部;
-    /// 1: 已标记资金申请;
-    /// </summary>
-    public int AmountStatus { get; set; }
+    ///// <summary>
+    ///// 资金状态
+    ///// 0: 全部;
+    ///// 1: 已标记资金申请;
+    ///// </summary>
+    //public int AmountStatus { get; set; }
 
     /// <summary>
     /// 受理编号
@@ -1850,20 +1851,20 @@ public record OrderSnapshotItemsInDto : PagedRequest
     /// <summary>
     /// 接办人名称
     /// </summary>
-    public string? ActualHandlerName { get; set; }
+    //public string? ActualHandlerName { get; set; }
 
     /// <summary>
-    /// 来电号码
+    /// 申报人电话
     /// </summary>
     public string? FromPhone { get; set; }
 
     /// <summary>
     /// 联系号码
     /// </summary>
-    public string? Contact { get; set; }
+    //public string? Contact { get; set; }
 
     /// <summary>
-    /// 来电人
+    /// 申报人姓名
     /// </summary>
     public string? FromName { get; set; }
 
@@ -1910,12 +1911,12 @@ public record OrderSnapshotItemsInDto : PagedRequest
     /// <summary>
     /// 办结时间开始
     /// </summary>
-    public DateTime? BeginCenterToOrgTime { get; set; }
+    public DateTime? BeginFiledTime { get; set; }
 
     /// <summary>
     /// 办结时间结束
     /// </summary>
-    public DateTime? EndCenterToOrgTime { get; set; }
+    public DateTime? EndFiledTime { get; set; }
 
     /// <summary>
     /// 热点类型名称
@@ -1925,7 +1926,7 @@ public record OrderSnapshotItemsInDto : PagedRequest
     /// <summary>
     /// 工单标签
     /// </summary>
-    public string? Label { get; set; }
+    public string? OrderTagCode { get; set; }
 
     /// <summary>
     /// 是否紧急
@@ -1951,6 +1952,11 @@ public record OrderSnapshotItemsInDto : PagedRequest
     /// 行业
     /// </summary>
     public string? IndustryId { get; set; }
+
+    /// <summary>
+    /// 是否电气焊工单
+    /// </summary>
+    public bool? IsElectric { get; set; }
 }
 
 public class OrderSnapshotItemsOutDto
@@ -2096,7 +2102,7 @@ public class OrderSnapshotItemsOutDto
     /// <summary>
     /// 办结时间
     /// </summary>
-    public DateTime? CenterToOrgTime { get; set; }
+    public DateTime? FiledTime { get; set; }
 
     /// <summary>
     /// 受理类型