议价查询条件

BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs

@@ -638,8 +638,7 @@ namespace BBWYB.Server.Business
                 var barginTeamId = uInfo.bargainTeam?.Id ?? string.Empty;
 
                 select = fsql.Select<SpuOptimizationTask>()
-                             .Where(t => t.IsOptimizationCompleted == false &&
-                                         t.CreateTime >= request.StartTime &&
+                             .Where(t => t.CreateTime >= request.StartTime &&
                                          t.CreateTime <= request.EndTime)
                              .WhereIf(request.BelongShopId != null && request.BelongShopId != 0, t => t.BelongShopId == request.BelongShopId)
                              .WhereIf(!string.IsNullOrEmpty(request.JDSku) ||
@@ -661,9 +660,12 @@ namespace BBWYB.Server.Business
                                                                     .Where(sbt => sbt.IsOptimizationCompleted == false &&
                                                                                 sbt.SpuOptimizationTaskId == t.Id &&
                                                                                 sbt.BelongTeamId == barginTeamId)
-                                                                    .Any());
+                                                                    .Any())
+                             .WhereIf(!request.IsCompleted && string.IsNullOrEmpty(barginTeamId), t => t.IsOptimizationCompleted == false);
             }
 
+            var sql = select.ToSql();
+
             var taskList = select.OrderBy(t => t.CreateTime)
                                  .Count(out var total)
                                  .Page(request.PageIndex, request.PageSize)
@@ -973,7 +975,7 @@ namespace BBWYB.Server.Business
                                                                                     sbt.BelongTeamId == barginTeamId)
                                                                         .Any()).Count();
             }
-                
+
             return fsql.Select<SpuOptimizationTask>().Where(t => t.IsOptimizationCompleted == false).Count();
         }
     }