From 953bca93f54b51dcf3768ba14bfa2e37f23df645 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Wed, 13 Mar 2024 10:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E8=AE=A2=E5=8D=95=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/ProvideServices/GetPageTrackOrderInput.cs     | 10 +++++-----
 .../Dtos/Order/GetPageTrackOrderInputVO.cs             | 10 ++++++++++
 .../Repositories/OrderRepository.cs                    |  7 ++++++-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
index 9bd8fcc9..c6a143df 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
@@ -22,11 +22,6 @@ public class GetPageTrackOrderInput : PageInfoInput
     /// </summary>
     public int TabType { get; set; }
 
-    ///// <summary>
-    ///// 当tab选中  0 默认不传  1 直接写死传值  [1,4]  2  传  [2,4]
-    ///// </summary>
-    //public List<int>? QuestionTypeIds {  get; set; }
-
     /// <summary>
     /// 订单类型
     /// </summary>
@@ -37,6 +32,11 @@ public class GetPageTrackOrderInput : PageInfoInput
     /// </summary>
     public int? CustomerId { get; set; }
 
+    ///// <summary>
+    ///// 当tab选中  0 默认不传  1 直接写死传值  [1,4]  2  传  [2,4]
+    ///// </summary>
+    //public List<int>? QuestionTypeIds {  get; set; }
+
     /// <summary>
     /// 创建时间开始
     /// </summary>
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
index b0abd5b0..788c9fb8 100644
--- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
@@ -28,6 +28,16 @@ namespace SJZY.Track.Domain.Dtos.Order
         ///// </summary>
         //public List<int>? QuestionTypeIds { get; set; }
 
+        /// <summary>
+        /// 订单类型
+        /// </summary>
+        public int? TrackOrderType { get; set; }
+
+        /// <summary>
+        /// 客户id
+        /// </summary>
+        public int? CustomerId { get; set; }
+
         /// <summary>
         /// 单号
         /// </summary>
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index 43de6ccb..e160ec0b 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -123,6 +123,7 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
     {
         List<string> orderNoList = new List<string>();
         List<int> questionTypeIds = new List<int>();
+        int ques = 0;
         if (!input.OrderNos.IsNullOrWhiteSpace())
         {
             orderNoList = input.OrderNos.Split(new char[] { ',', '，', ':', '：' }).ToList();
@@ -130,10 +131,12 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
         if (input.TabType==1)
         {
             questionTypeIds= new List<int> { 1, 4 };
+            ques = questionTypeIds.Sum();
         }
         else if (input.TabType==2)
         {
             questionTypeIds= new List<int> { 2, 4 };
+            ques = questionTypeIds.Sum();
         }
 
         var pageList = await Context.Queryable<OrderEntity>()
@@ -147,7 +150,9 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
                 (a, b, c) => a.CreateTime >= input.CreateTimeStart)
             .WhereIF((!input.CreateTimeStart.HasValue) && input.CreateTimeEnd.HasValue,
                 (a, b, c) => a.CreateTime <= input.CreateTimeEnd)
-            .WhereIF(input.TabType>0 && (!questionTypeIds.IsNullOrEmpty()), (a, b, c) => questionTypeIds.Contains(a.QuestionType))
+            .WhereIF(input.CustomerId>0, (a, b, c) => a.CustomId==input.CustomerId)
+            .WhereIF(input.TrackOrderType>0, (a, b, c) => a.OrderType==input.TrackOrderType)
+            .WhereIF(input.TabType>0 && (!questionTypeIds.IsNullOrEmpty()), (a, b, c) => (a.QuestionType&ques)>0)
             .OrderByDescending((a, b, c) => a.CreateTime)
             .Select((a, b, c) => new TrackOrderVO
             {