费用审核

团组了列表 增加分页

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -261,13 +261,54 @@ namespace OASystem.API.Controllers
         {
             if (dto == null) return Ok(JsonView(false, "请输入搜索搜索条件!"));
 
-            var groupData = await _groupRepository.PostGroupPageList(dto);
-            if (groupData.Code != 0)
+            if (dto.PortType == 1 || dto.PortType == 2) // web/Android
             {
-                return Ok(JsonView(false, groupData.Msg));
+                string sqlWhere = string.Empty;
+                if (dto.IsSure == 0) //未完成
+                {
+                    sqlWhere += string.Format(@" And IsSure = 0");
+                }
+                else if (dto.IsSure == 1) //已完成
+                {
+                    sqlWhere += string.Format(@" And IsSure = 1");
+                }
+
+                if (!string.IsNullOrEmpty(dto.SearchCriteria))
+                {
+                    string tj = dto.SearchCriteria;
+                    sqlWhere += string.Format(@"And (ssd.Name Like '%{0}%' Or TeamName Like '%{1}%' Or ClientName Like '%{2}%' Or  ClientName Like '%{3}%' Or JietuanOperator  Like '%{4}%')",
+                       tj, tj, tj, tj, tj);
+                }
+
+                string sql = string.Format(@"Select Row_Number,SalesQuoteNo,TourCode,TeamTypeId, TeamType,
+					                              TeamLevId,TeamLev,TeamName,ClientName,ClientUnit,
+					                              VisitDate,VisitDays,VisitPNumber,JietuanOperator,IsSure,CreateTime
+					                              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,su.CnName JietuanOperator,IsSure,gdi.CreateTime
+					                              From  Grp_DelegationInfo gdi
+					                              Inner Join Sys_SetData ssd On gdi.TeamDid = ssd.Id 
+					                              Inner Join Sys_SetData ssd1 On gdi.TeamLevSId = ssd1.Id
+					                              Left Join Sys_Users su On gdi.JietuanOperator = su.Id
+					                              Where gdi.IsDel = 0  {0}
+				                              ) temp  ", sqlWhere);
+
+                RefAsync<int> total = 0;//REF和OUT不支持异步,想要真的异步这是最优解
+                var _DelegationList = await _sqlSugar.SqlQueryable<DelegationListView>(sql).ToPageListAsync(dto.PageIndex, dto.PageSize, total);//ToPageAsync
+
+                return Ok(JsonView(true,"查询成功!",_DelegationList, total));
+
             }
+            else
+            {
+                return Ok(JsonView(false, "查询失败"));
+            }
+               
+           
 
-            return Ok(JsonView(groupData.Data));
+            
         }
 
         /// <summary>

OASystem/OASystem.Domain/Dtos/Groups/GroupListDto.cs

@@ -20,6 +20,12 @@ namespace OASystem.Domain.Dtos.Groups
     /// </summary>
     public class GroupPageListDto : DtoBase
     {
+        /// <summary>
+        /// 是否操作完成 
+        /// -1 全部 0否 1是
+        /// </summary>
+        public int IsSure { get; set; }
+
         /// <summary>
         /// 搜索条件
         /// 团组类型/团队名称/客户名称/客户单位/接团操作人

OASystem/OASystem.Domain/ViewModels/Groups/DelegationInfoView.cs

@@ -332,6 +332,8 @@ namespace OASystem.Domain.ViewModels.Groups
         public int IsSure { get; set; }
     }
 
+    
+
     /// <summary>
     /// 团组信息 Page List
     /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using NPOI.OpenXmlFormats.Wordprocessing;
 using OASystem.Domain;
 using OASystem.Domain.Dtos;
 using OASystem.Domain.Dtos.Financial;
@@ -216,43 +217,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
         }
 
-        /// <summary>
-        /// 获取接团信息 Page List
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        public async Task<Result> PostGroupPageList(GroupPageListDto dto)
-        {
-            Result result = new Result() { Code = -2, Msg = "未知错误" };
-
-            if (dto.PortType == 1 || dto.PortType == 2) // web/Android
-            {
-                string sql = string.Format(@"Select gdi.Id,SalesQuoteNo,TourCode,ssd.Id TeamTypeId, ssd.Name TeamType,ssd1.Id TeamLevId,ssd1.Name TeamLev,TeamName,ClientName,ClientUnit,VisitDate,VisitDays,VisitPNumber,su.CnName JietuanOperator,IsSure
-                  From  Grp_DelegationInfo gdi
-                  Inner Join Sys_SetData ssd On gdi.TeamDid = ssd.Id 
-                  Inner Join Sys_SetData ssd1 On gdi.TeamLevSId = ssd1.Id
-                  Left Join Sys_Users su On gdi.JietuanOperator = su.Id
-                  Where gdi.IsDel = 0 
-                  Order By gdi.CreateTime Desc");
-
-                var _DelegationList = await _sqlSugar.SqlQueryable<DelegationListView>(sql).ToListAsync();
-                if (_DelegationList.Count > 0)
-                {
-                    result.Code = 0;
-                    result.Msg = "成功!";
-                    result.Data = _DelegationList;
-                }
-                else
-                {
-                    result.Msg = "暂无该团组信息";
-                }
-            }
-
-
-            return result;
-
-        }
-
         /// <summary>
         /// 获取接团信息Info
         /// </summary>