From 0906bf741b4f1c4e24d5ec07a1eb912e46138d3f Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 12 Jul 2023 13:51:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B6=85=E6=97=B6=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TimeLimitTask/TimeLimitTaskBusiness.cs | 6 ++++-- .../TimeLimitTask/QueryTimeLimitTaskRequest.cs | 11 ++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs b/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs index a3836de..f80e3ea 100644 --- a/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs +++ b/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs @@ -34,8 +34,10 @@ namespace BBWYB.Server.Business request.EndDate = request.EndDate.Date.AddDays(1).AddSeconds(-1); var list = fsql.Select().WhereIf(request.ShopId != null, t => t.ShopId == request.ShopId) .Where(t => t.CreateTme >= request.StartDate && t.CreateTme <= request.EndDate) - .WhereIf(request.IsCompleted, t => t.CompletionTime != null) - .WhereIf(!request.IsCompleted, t => t.CompletionTime == null) + .WhereIf(request.IsCompleted != null && request.IsCompleted == true, t => t.CompletionTime != null) + .WhereIf(request.IsCompleted != null && request.IsCompleted == false, t => t.CompletionTime == null) + .WhereIf(request.IsTimeOut != null && request.IsTimeOut == true, t => t.IsTimely == false) + .WhereIf(request.IsTimeOut != null && request.IsTimeOut == false, t => t.IsTimely == true) .WhereIf(request.TimeLimitTaskType != null, t => t.TaskType == request.TimeLimitTaskType) .OrderByDescending(t => t.CreateTme) .Count(out var count) diff --git a/BBWYB.Server.Model/Dto/Request/TimeLimitTask/QueryTimeLimitTaskRequest.cs b/BBWYB.Server.Model/Dto/Request/TimeLimitTask/QueryTimeLimitTaskRequest.cs index 3976ade..a538be5 100644 --- a/BBWYB.Server.Model/Dto/Request/TimeLimitTask/QueryTimeLimitTaskRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/TimeLimitTask/QueryTimeLimitTaskRequest.cs @@ -9,12 +9,17 @@ public Enums.TimeLimitTaskType? TimeLimitTaskType { get; set; } /// - /// 是否完成 + /// 是否完成,可空 /// - public bool IsCompleted { get; set; } + public bool? IsCompleted { get; set; } /// - /// 店铺Id (可空) + /// 是否超时,可空 + /// + public bool? IsTimeOut { get; set; } + + /// + /// 店铺Id,可空 /// public long? ShopId { get; set; }