Merge branch 'timelimittask'

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<TimeLimitTask>().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)

BBWYB.Server.Model/Dto/Request/TimeLimitTask/QueryTimeLimitTaskRequest.cs

@@ -9,12 +9,17 @@
         public Enums.TimeLimitTaskType? TimeLimitTaskType { get; set; }
 
         /// <summary>
-        /// 是否完成
+        /// 是否完成,可空
         /// </summary>
-        public bool IsCompleted { get; set; }
+        public bool? IsCompleted { get; set; }
 
         /// <summary>
-        /// 店铺Id (可空)
+        /// 是否超时,可空
+        /// </summary>
+        public bool? IsTimeOut { get; set; }
+
+        /// <summary>
+        /// 店铺Id,可空
         /// </summary>
         public long? ShopId { get; set; }