Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

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();
@@ -2616,6 +2617,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 ");
 
@@ -2726,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 ");
             
@@ -2829,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");
@@ -2854,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");
@@ -2881,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");
@@ -2906,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");
@@ -2974,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)
@@ -2987,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;
@@ -3100,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;
@@ -3127,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");
@@ -3152,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");
@@ -3180,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");
 
@@ -5039,8 +5062,20 @@ FROM
   Grp_DelegationInfo di
 WHERE
   di.IsDel = 0
+  AND (
+        SELECT
+          CAST(
+            COALESCE(SUM(ItemSumPrice * Rate), 0) AS DECIMAL(12, 2)
+          ) AS GroupSales
+        FROM
+          Fin_ForeignReceivables
+        WHERE
+          IsDel = 0
+          AND di.Id = Diid
+          AND AddingWay IN (0, 1, 2)
+      ) > 0
   AND di.IsBid = 0 
-  AND di.TeamDid IN (38, 39, 40, 1048)
+  --AND di.TeamDid IN (38, 39, 40, 1048)
   AND di.VisitDate BETWEEN '{0}' AND '{1}'
 ", beginDt, endDt);
 
@@ -5050,7 +5085,7 @@ WHERE
             }
 
             var view = await _sqlSugar.SqlQueryable<StatisticsBRCostView>(sql).ToListAsync();
-            view = view.OrderByDescending(x => x.Id).ToList();
+            view = view.Where(x => !x.GroupName.Contains("投标") && x.RealityAmount > 0).OrderByDescending(x => x.Id).ToList();
             var total = view.Count;
             var toSkip = (_dto.PageIndex - 1) * _dto.PageSize;
             var data = view.Skip(toSkip).Take(_dto.PageSize).ToList();

OASystem/OASystem.Infrastructure/Repositories/Resource/MediaSuppliersRepository.cs

@@ -111,7 +111,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             var infos = await _sqlSugar.Queryable<Res_MediaSuppliers>()
                 .LeftJoin<Sys_Users>((ms, u) => ms.CreateUserId == u.Id)
                 .Where((ms, u) => ms.IsDel == 0)
-                .WhereIF(typeLabel.Count > 0 ,x=> typeLabel.Contains(x.TypeId))
+                .WhereIF(typeLabel.Count > 0 , (ms, u) => typeLabel.Contains(ms.TypeId))
                 .WhereIF(!string.IsNullOrEmpty(search), (ms, u) => ms.UnitName.Contains(search) || ms.Contact.Contains(search) || ms.Tel.Contains(search))
                 .OrderByDescending((ms, u) => ms.CreateTime)
                 .Select((ms, u) => new