From 223f59ebcee5e8130cf96012161f18458bc52e66 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 10 Apr 2024 19:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=AA=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=B8=94=E8=B6=85=E6=97=B6=E7=9A=84=E4=BB=BB=E5=8A=A1=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SkuOptimization/OptimizationBusiness.cs               | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs
index d62d8b2..884dfe2 100644
--- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs
+++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs
@@ -1061,8 +1061,12 @@ namespace BBWYB.Server.Business
         /// <returns></returns>
         public long GetNoCompletedAndTimeOutSpuOptimizationTaskCount()
         {
-            return fsql.Select<SpuOptimizationTask>().Where(t => t.ReStartTimes > 2 && t.IsOptimizationCompleted == false)
-                                                     .Count();
+            return fsql.Select<SpuOptimizationTask, TimeLimitTask>()
+                       .InnerJoin((st, t) => st.Id == t.TaskId)
+                       .Where((st, t) => st.ReStartTimes > 0 ||
+                                        (t.CompletionTime == null &&
+                                        t.ExpirationTime < DateTime.Now))
+                       .Count();
         }
 
     }