+1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1022,22 +1022,62 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "开始或结束时间不正确!"));
             }
 
-            string sql = string.Format(@"Select Row_Number,Id,SalesQuoteNo,TourCode,TeamTypeId, TeamType,
-                                             	TeamLevId,TeamLev,TeamName,ClientName,ClientUnit,
-                                             	VisitDate,VisitDays,VisitPNumber,JietuanOperatorId,
-                                             	JietuanOperator,IsSure,CreateTime,IsBid
-                                             	From (
-                                             	Select row_number() over(order by gdi.CreateTime Desc) as Row_Number,
-                                             	gdi.Id,SalesQuoteNo,TourCode,ssd.Id TeamTypeId, ssd.Name TeamType,
-                                             	ssd1.Id TeamLevId,ssd1.Name TeamLev,TeamName,ClientName,ClientUnit,
-                                             	VisitDate,VisitDays,VisitPNumber,JietuanOperator JietuanOperatorId,
-                                             	su.CnName JietuanOperator,IsSure,gdi.CreateTime,gdi.IsBid
-                                             	From  Grp_DelegationInfo gdi
-                                             	Left Join Sys_SetData ssd On gdi.TeamDid = ssd.Id 
-                                             	Left Join Sys_SetData ssd1 On gdi.TeamLevSId = ssd1.Id
-                                             	Left Join Sys_Users su On gdi.JietuanOperator = su.Id
-                                             	Where gdi.IsDel = 0 And gdi.CreateTime Between '{0}' And '{1}'
-                                             ) temp", _beginDt.ToString("yyyy-MM-dd HH:mm:ss"), _endDt.ToString("yyyy-MM-dd HH:mm:ss"));
+            string sql = string.Format(@"
+SELECT
+  ROW_NUMBER,
+  Id,
+  SalesQuoteNo,
+  TourCode,
+  TeamTypeId,
+  TeamType,
+  TeamLevId,
+  TeamLev,
+  TeamName,
+  ClientName,
+  ClientUnit,
+  VisitDate,
+  VisitDays,
+  VisitPNumber,
+  JietuanOperatorId,
+  JietuanOperator,
+  IsSure,
+  CreateTime,
+  IsBid
+FROM
+  (
+    SELECT
+      ROW_NUMBER() OVER(
+        ORDER BY
+          gdi.CreateTime Desc
+      ) AS ROW_NUMBER,
+      gdi.Id,
+      SalesQuoteNo,
+      TourCode,
+      ssd.Id TeamTypeId,
+      ssd.Name TeamType,
+      ssd1.Id TeamLevId,
+      ssd1.Name TeamLev,
+      TeamName,
+      ClientName,
+      ClientUnit,
+      VisitDate,
+      VisitDays,
+      VisitPNumber,
+      JietuanOperator JietuanOperatorId,
+      su.CnName JietuanOperator,
+      IsSure,
+      gdi.CreateTime,
+      gdi.IsBid
+    FROM
+      Grp_DelegationInfo gdi
+      LEFT JOIN Sys_SetData ssd ON gdi.TeamDid = ssd.Id
+      LEFT JOIN Sys_SetData ssd1 ON gdi.TeamLevSId = ssd1.Id
+      LEFT JOIN Sys_Users su ON gdi.JietuanOperator = su.Id
+    WHERE
+      gdi.IsDel = 0
+      AND gdi.IsBid = 0
+      AND gdi.CreateTime BETWEEN '{0}' AND '{1}'
+  ) temp", _beginDt.ToString("yyyy-MM-dd HH:mm:ss"), _endDt.ToString("yyyy-MM-dd HH:mm:ss"));
 
 
             var groupList = await _sqlSugar.SqlQueryable<DelegationListView>(sql).ToListAsync();