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
///
public int TabType { get; set; }
- /////
- ///// 当tab选中 0 默认不传 1 直接写死传值 [1,4] 2 传 [2,4]
- /////
- //public List? QuestionTypeIds { get; set; }
-
///
/// 订单类型
///
@@ -37,6 +32,11 @@ public class GetPageTrackOrderInput : PageInfoInput
///
public int? CustomerId { get; set; }
+ /////
+ ///// 当tab选中 0 默认不传 1 直接写死传值 [1,4] 2 传 [2,4]
+ /////
+ //public List? QuestionTypeIds { get; set; }
+
///
/// 创建时间开始
///
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
index aa8036c0..fe8e3fb1 100644
--- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
@@ -24,6 +24,16 @@ namespace SJZY.Track.Domain.Dtos.Order
public int TabType { get; set; }
+ ///
+ /// 订单类型
+ ///
+ public int? TrackOrderType { get; set; }
+
+ ///
+ /// 客户id
+ ///
+ public int? CustomerId { get; set; }
+
///
/// 单号
///
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index c4389cdd..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, IOrderRepository, I
{
List orderNoList = new List();
List questionTypeIds = new List();
+ int ques = 0;
if (!input.OrderNos.IsNullOrWhiteSpace())
{
orderNoList = input.OrderNos.Split(new char[] { ',', ',', ':', ':' }).ToList();
@@ -130,10 +131,12 @@ public class OrderRepository : BasicRepository, IOrderRepository, I
if (input.TabType==1)
{
questionTypeIds= new List { 1, 4 };
+ ques = questionTypeIds.Sum();
}
else if (input.TabType==2)
{
questionTypeIds= new List { 2, 4 };
+ ques = questionTypeIds.Sum();
}
var pageList = await Context.Queryable()
@@ -149,7 +152,7 @@ public class OrderRepository : BasicRepository, IOrderRepository, I
(a, b, c) => a.CreateTime <= input.CreateTimeEnd)
.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) => questionTypeIds.Contains(a.QuestionType))
+ .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
{