Browse Source

中心话务甄别

田爽 6 months ago
parent
commit
c628381d94

+ 9 - 2
src/Hotline.Api/Controllers/OrderController.cs

@@ -2010,12 +2010,19 @@ public class OrderController : BaseController
             query.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
             query.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                     x => x.OrderVisit.Order.Title.Contains(dto.Keyword!) ||
                     x => x.OrderVisit.Order.Title.Contains(dto.Keyword!) ||
                          x.OrderVisit.Order.No.Contains(dto.Keyword!))
                          x.OrderVisit.Order.No.Contains(dto.Keyword!))
-                .Where(x => x.VisitTarget == EVisitTarget.Org && (
+                .WhereIF(dto.ScreenType == OrderScreenType.Org,x => x.VisitTarget == EVisitTarget.Org && (
                     SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
                     SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
                     SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||
                     SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||
                     SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "1" ||
                     SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "1" ||
                     SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "2"
                     SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "2"
-                ));
+                ))
+                .WhereIF(dto.ScreenType == OrderScreenType.Seat, x => x.VisitTarget == EVisitTarget.Seat && (
+	                SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
+	                SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||
+	                SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "1" ||
+	                SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "2"
+                ))
+				;
         }
         }
 
 
         var (total, items) = await query
         var (total, items) = await query

+ 13 - 0
src/Hotline.Share/Dtos/Order/OrderScreenDto.cs

@@ -343,4 +343,17 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		/// </summary>
 		public DateTime ScreenByEndTime { get; set; }
 		public DateTime ScreenByEndTime { get; set; }
 	}
 	}
+
+	public enum OrderScreenType 
+	{
+		/// <summary>
+		/// 部门办件
+		/// </summary>
+		Org = 0,
+
+		/// <summary>
+		/// 中心话务
+		/// </summary>
+		Seat =1,
+	}
 }
 }

+ 4 - 1
src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -745,7 +745,10 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         /// </summary>
         public string? OrgNoSatisfiedReason { get; set; }
         public string? OrgNoSatisfiedReason { get; set; }
 
 
-       
+		/// <summary>
+		/// 甄别类型
+		/// </summary>
+		public OrderScreenType? ScreenType { get; set; }
 	}
 	}
 
 
     public record UrgeListDto : PagedKeywordRequest
     public record UrgeListDto : PagedKeywordRequest

+ 7 - 0
src/Hotline/Orders/OrderScreen.cs

@@ -4,6 +4,7 @@ using Hotline.Share.Enums.Order;
 using SqlSugar;
 using SqlSugar;
 using System.ComponentModel;
 using System.ComponentModel;
 using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.File;
+using Hotline.Share.Dtos.Order;
 using XF.Domain.Repository;
 using XF.Domain.Repository;
 
 
 namespace Hotline.Orders
 namespace Hotline.Orders
@@ -169,5 +170,11 @@ namespace Hotline.Orders
         /// </summary>
         /// </summary>
         [SugarColumn(ColumnDescription = "甄别审批时间")]
         [SugarColumn(ColumnDescription = "甄别审批时间")]
         public DateTime? NewestAuditTime { get; set; }
         public DateTime? NewestAuditTime { get; set; }
+
+        /// <summary>
+        /// 甄别类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "甄别类型",DefaultValue ="0")]
+		public OrderScreenType?  ScreenType { get; set; }
 	}
 	}
 }
 }