销售额 --> 团组查询 增加条件 di.IsBid = 0 AND di.TeamName Not Like '%投标%'

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2322,7 +2322,6 @@ ORDER BY
             return Ok(JsonView(true, "操作成功!", await GroupSales(_dto.CompanyId, _dto.GroupPickupUserId, beginDt, endDt)));
         }
 
-
         private async Task<List<int>> GetUserIds(int companyId, int groupPickupUserId)
         {
             //全部人员Id
@@ -2443,6 +2442,8 @@ FROM
 		Grp_DelegationInfo di
 	WHERE di.IsDel = 0 
 		AND di.JietuanOperator IN (SELECT Id FROM Sys_Users WITH (NoLock) WHERE IsDel = 0 {3})
+        AND di.IsBid = 0 
+        AND di.TeamName Not Like '%投标%'
 		AND di.VisitDate BETWEEN '{4}' AND '{5}'
 	) temp", userSqlWhere, beginDt, endDt, userSqlWhere, lastBeginDt, lastEndDt);
             var salesData = await _sqlSugar.SqlQueryable<SalesView>(salesSql).ToListAsync();
@@ -2728,6 +2729,8 @@ FROM
           AND AddingWay IN (0, 1, 2)
       ) > 0
 	   {userSql}  
+      AND di.IsBid = 0 
+      AND di.TeamName Not Like '%投标%'
       AND VisitDate Between '{beginDt}' And  '{endDt}'
   ) Temp ");
             
@@ -2831,6 +2834,8 @@ And (
     AND AddingWay IN (0, 1, 2)
 ) > 0
  {userSql} 
+    AND di.IsBid = 0 
+    AND di.TeamName Not Like '%投标%'
 And VisitDate Between '{beginDt}' And  '{endDt}'
 Group By [Name]
 Order By Count Desc");
@@ -2856,6 +2861,8 @@ And (
     AND AddingWay IN (0, 1, 2)
 ) > 0
  {userSql} 
+    AND di.IsBid = 0 
+    AND di.TeamName Not Like '%投标%'
 And VisitDate Between '{beginDt}' And  '{endDt}'
 Group By [Name]
 Order By Count Desc");
@@ -2883,6 +2890,8 @@ And (
     AND AddingWay IN (0, 1, 2)
 ) > 0
  {userSql} 
+AND di.IsBid = 0 
+AND di.TeamName Not Like '%投标%'
 And VisitDate Between '{beginDt}' And  '{endDt}'
 Group By [Name]
 Order By Count Desc");
@@ -2908,6 +2917,8 @@ And (
     AND AddingWay IN (0, 1, 2)
 ) > 0
  {userSql} 
+AND di.IsBid = 0 
+AND di.TeamName Not Like '%投标%'
 And VisitDate Between '{beginDt}' And  '{endDt}'
 Group By [Name]
 Order By Count Desc");
@@ -2976,7 +2987,7 @@ Order By Count Desc");
 	From Grp_DelegationInfo di
 	Left Join Sys_Users u On di.JietuanOperator = u.Id
 	Where di.Isdel = 0 
-	And (
+	AND (
       SELECT
         CAST(
           COALESCE(SUM(ItemSumPrice * Rate), 0) AS DECIMAL(12, 2)
@@ -2989,7 +3000,9 @@ Order By Count Desc");
         AND AddingWay IN (0, 1, 2)
     ) > 0
      {userSql} 
-	And VisitDate Between '{beginDt}' And  '{endDt}'
+    AND di.IsBid = 0 
+    AND di.TeamName Not Like '%投标%'
+	AND VisitDate Between '{beginDt}' AND  '{endDt}'
 	Group By CnName");
 
             RefAsync<int> total = 0;
@@ -3102,6 +3115,8 @@ FROM
             AND AddingWay IN (0, 1, 2)
         ) > 0 
 	   {userSql} 
+      AND di.IsBid = 0 
+      AND di.TeamName Not Like '%投标%'
       AND VisitDate Between '{beginDt}' And  '{endDt}'
   ) Temp ");
             RefAsync<int> total = 0;
@@ -3129,6 +3144,8 @@ And (
     AND AddingWay IN (0, 1, 2)
 ) > 0 
  {userSql} 
+      AND di.IsBid = 0 
+      AND di.TeamName Not Like '%投标%'
 And VisitDate Between '{beginDt}' And  '{endDt}'
 Group By [Name]
 Order By Count Desc");
@@ -3154,6 +3171,8 @@ And (
     AND AddingWay IN (0, 1, 2)
 ) > 0 
  {userSql} 
+      AND di.IsBid = 0 
+      AND di.TeamName Not Like '%投标%'
 And VisitDate Between '{beginDt}' And  '{endDt}'
 Group By [Name]
 Order By Count Desc");
@@ -3182,6 +3201,8 @@ And (
     AND AddingWay IN (0, 1, 2)
 ) > 0
     {userSql} 
+      AND di.IsBid = 0 
+      AND di.TeamName Not Like '%投标%'
 And VisitDate Between '{beginDt}' And  '{endDt}'
 Group By CnName");