From 49a0d8c12f45e436295adc3907203808a403884d Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Thu, 4 Apr 2024 04:51:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E4=BB=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SkuOptimization/OptimizationBusiness.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs index d6250e1..062a0b8 100644 --- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs @@ -638,8 +638,7 @@ namespace BBWYB.Server.Business var barginTeamId = uInfo.bargainTeam?.Id ?? string.Empty; select = fsql.Select() - .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().Where(t => t.IsOptimizationCompleted == false).Count(); } }