增加taskId条件

BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs

@@ -540,19 +540,29 @@ namespace BBWYB.Server.Business
         {
             request.EndTime = request.EndTime.Date;
             var uInfo = userBusiness.GetisBargainTeamByUserId(userId, true);
-            var taskList = fsql.Select<SpuOptimizationTask>()
+
-                               .Where(t => t.IsOptimizationCompleted == false &&
+            ISelect<SpuOptimizationTask> select = null;
-                                           t.CreateTime >= request.StartTime &&
+            if (request.SpuOptimizationTaskId != null && request.SpuOptimizationTaskId != 0)
-                                           t.CreateTime <= request.EndTime)
+            {
-                               .WhereIf(request.BelongShopId != null && request.BelongShopId != 0, t => t.BelongShopId == request.BelongShopId)
+                select = fsql.Select<SpuOptimizationTask>(request.SpuOptimizationTaskId);
-                               .WhereIf(!string.IsNullOrEmpty(request.JDSku), t => fsql.Select<SkuOptimizationTask>()
+            }
-                                                                                       .Where(st => st.SpuOptimizationTaskId == t.Id &&
+            else
-                                                                                                    st.JDSkuId == request.JDSku)
+            {
-                                                                                       .Any())
+                select = fsql.Select<SpuOptimizationTask>()
-                               .OrderByDescending(t => t.CreateTime)
+                             .Where(t => t.IsOptimizationCompleted == false &&
-                               .Count(out var total)
+                                         t.CreateTime >= request.StartTime &&
-                               .Page(request.PageIndex, request.PageSize)
+                                         t.CreateTime <= request.EndTime)
-                               .ToList<SpuOptimizationTaskResponse>();
+                             .WhereIf(request.BelongShopId != null && request.BelongShopId != 0, t => t.BelongShopId == request.BelongShopId)
+                             .WhereIf(!string.IsNullOrEmpty(request.JDSku), t => fsql.Select<SkuOptimizationTask>()
+                                                                                     .Where(st => st.SpuOptimizationTaskId == t.Id &&
+                                                                                                  st.JDSkuId == request.JDSku)
+                                                                                           .Any());
+            }
+
+            var taskList = select.OrderByDescending(t => t.CreateTime)
+                                 .Count(out var total)
+                                 .Page(request.PageIndex, request.PageSize)
+                                 .ToList<SpuOptimizationTaskResponse>();
 
             var spuTaskIdList = taskList.Select(t => t.Id).ToList();
 

BBWYB.Server.Model/Dto/Request/Optimization/QueryNoCompletionOptimizationTaskRequest.cs

@@ -25,5 +25,10 @@ namespace BBWYB.Server.Model.Dto
         /// </summary>
         [Required]
         public DateTime EndTime { get; set; }
+
+        /// <summary>
+        /// SPU优化任务Id
+        /// </summary>
+        public long? SpuOptimizationTaskId { get; set; }
     }
 }