更新完成条件查询

BBWYB.Server.API/Controllers/SkuOptimizationController.cs

@@ -78,7 +78,7 @@ namespace BBWYB.Server.API.Controllers
         [HttpGet]
         public long GetNoCompletedSpuOptimizationTaskCount()
         {
-            return optimizationBusiness.GetNoCompletedSpuOptimizationTaskCount();
+            return optimizationBusiness.GetNoCompletedSpuOptimizationTaskCount(GetUserId());
         }
     }
 }

BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs

@@ -960,8 +960,20 @@ namespace BBWYB.Server.Business
             //fsql.Delete<SpuOptimizationCompetitiveTenderTask>(ctTaskIdList).ExecuteAffrows();
         }
 
-        public long GetNoCompletedSpuOptimizationTaskCount()
+        public long GetNoCompletedSpuOptimizationTaskCount(string userId)
         {
+            var uInfo = userBusiness.GetisBargainTeamByUserId(userId);
+            if (uInfo.isBargainTeam)
+            {
+                var barginTeamId = uInfo.bargainTeam?.Id ?? string.Empty;
+                return fsql.Select<SpuOptimizationTask>().Where(t => t.IsOptimizationCompleted == false &&
+                                                                         fsql.Select<SpuOptimizationBargainTeamTask>()
+                                                                        .Where(sbt => sbt.IsOptimizationCompleted == false &&
+                                                                                    sbt.SpuOptimizationTaskId == t.Id &&
+                                                                                    sbt.BelongTeamId == barginTeamId)
+                                                                        .Any()).Count();
+            }
+                
             return fsql.Select<SpuOptimizationTask>().Where(t => t.IsOptimizationCompleted == false).Count();
         }
     }