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