From 120f3c80d1ea60dd23e77010eaa03fb824fc25bb Mon Sep 17 00:00:00 2001 From: sanji Date: Wed, 24 Jan 2024 18:50:04 +0800 Subject: [PATCH] =?UTF-8?q?pjzs=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluationAssistant/EvaluationAssistantBusiness.cs | 1 + .../Dto/Request/PromotionTask/QueryPromotionTaskRequest.cs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs index 4c9fede5..acbe4757 100644 --- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs +++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs @@ -287,6 +287,7 @@ namespace BBWY.Server.Business var list = fsql.Select().As("pt") .Where(pt => pt.ShopId == request.ShopId) .Where(pt => pt.IsEnabled == true) + .WhereIf(request.Status != null, pt => pt.Status == request.Status) .OrderBy(pt => SqlExt.Case().When(pt.Status == Enums.PromitionTaskStatus.进行中, 0) .When(pt.Status == Enums.PromitionTaskStatus.等待, 1) .When(pt.Status == Enums.PromitionTaskStatus.已完成, 2) diff --git a/BBWY.Server.Model/Dto/Request/PromotionTask/QueryPromotionTaskRequest.cs b/BBWY.Server.Model/Dto/Request/PromotionTask/QueryPromotionTaskRequest.cs index c70c4a8f..02a1cd79 100644 --- a/BBWY.Server.Model/Dto/Request/PromotionTask/QueryPromotionTaskRequest.cs +++ b/BBWY.Server.Model/Dto/Request/PromotionTask/QueryPromotionTaskRequest.cs @@ -17,6 +17,8 @@ namespace BBWY.Server.Model.Dto public int PageSize { get; set; } public long ShopId { get; set; } + + public Enums.PromitionTaskStatus? Status { get; set; } } public class QueryPromotionTaskByIdRequest : StartPromotionTaskRequest