From 68993b5cb827279fc1b1ee3e60c367e0c9a7ffd1 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 12 Jul 2023 14:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=90=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TimeLimitTask/TimeLimitTaskBusiness.cs | 8 ++++---- .../Request/TimeLimitTask/QueryTimeLimitTaskRequest.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs b/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs index 5ac4062..b7cf06d 100644 --- a/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs +++ b/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs @@ -34,10 +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 != 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 || t.IsTimely == null) + .WhereIf(request.IsCompleted != null && request.IsCompleted == 1, t => t.CompletionTime != null) + .WhereIf(request.IsCompleted != null && request.IsCompleted == 0, t => t.CompletionTime == null) + .WhereIf(request.IsTimeOut != null && request.IsTimeOut == 1, t => t.IsTimely == false) + .WhereIf(request.IsTimeOut != null && request.IsTimeOut == 0, t => t.IsTimely == true || t.IsTimely == null) .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 a538be5..6f7b9cd 100644 --- a/BBWYB.Server.Model/Dto/Request/TimeLimitTask/QueryTimeLimitTaskRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/TimeLimitTask/QueryTimeLimitTaskRequest.cs @@ -9,14 +9,14 @@ public Enums.TimeLimitTaskType? TimeLimitTaskType { get; set; } /// - /// 是否完成,可空 + /// 是否完成,完成=1,未完成=0,可空 /// - public bool? IsCompleted { get; set; } + public int? IsCompleted { get; set; } /// - /// 是否超时,可空 + /// 是否超时,超时=1,未超时=0,可空 /// - public bool? IsTimeOut { get; set; } + public int? IsTimeOut { get; set; } /// /// 店铺Id,可空