修改机票列表传参

OASystem/OASystem.Domain/Dtos/Groups/AirTicketResDto.cs

@@ -9,10 +9,12 @@ namespace OASystem.Domain.Dtos.Groups
     /// <summary>
     /// 根据登录用户查询
     /// </summary>
-    public class AirTicketResDto
+    public class AirTicketResDto:DtoBase
     {
         public int DiId { get; set; } = 0;
         public int UserId { get; set; } = 0;
+
+        
     }
    public class ItineraryAirTicketResDto
     {

OASystem/OASystem.Infrastructure/Repositories/Groups/AirTicketResRepository.cs

@@ -75,7 +75,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
         public async Task<Result> AirTicketResList(AirTicketResDto dto)
         {
-                Result result = new Result() { Code = -2, Msg = "未知错误" };
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
 
             Grp_DelegationInfo _DelegationInfo = _sqlSugar.Queryable<Grp_DelegationInfo>().First(it => it.Id == dto.DiId);
             if (_DelegationInfo != null)
@@ -83,7 +83,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 string sql = string.Format(@"select a.*,c.IsAuditGM,(select Name from Sys_SetData where Id=a.cType) as 'CTypeName',(select Name from 
                                                 Sys_SetData where Id=a.PreCurrency) as 'PreCurrencyStr',(select Name from Sys_SetData where Id=a.Currency)
                                                 as 'CurrencyStr' from Grp_AirTicketReservations a,Grp_CreditCardPayment c where  a.id=c.CId  and a.isdel={1} and c.IsDel={1}
-                                                and a.DIId={0} Order By a.CreateTime desc", dto.DiId, 0);
+                                                and a.DIId={0} and a.CreateUserId={2} Order By a.CreateTime desc", dto.DiId, 0,dto.UserId);
                 List<AirTicketReservationsView> _AirTicketReservations = _sqlSugar.SqlQueryable<AirTicketReservationsView>(sql).ToList();
 
                 foreach (var item in _AirTicketReservations)
@@ -228,13 +228,53 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
                     _AirTicketReservations[i].ClientNameStr=_AirTicketReservations[i].ClientNameStr.Substring(0, _AirTicketReservations[i].ClientNameStr.Length-1);
                 }
-                var data = new
+
+                if (dto.PortType==1)
                 {
-                    DelegationInfo = _DelegationInfo,
-                    AirTicketReservations = _AirTicketReservations,
-                    AirGroupCostParameter = _AirgroupCostParameter
-                };
-                return result = new Result() { Code = 0, Msg = "查询成功！", Data = data };
+                    var data = new
+                    {
+                        DelegationInfo = _DelegationInfo,
+                        AirTicketReservations = _AirTicketReservations,
+                        AirGroupCostParameter = _AirgroupCostParameter
+                    };
+                    return result = new Result() { Code = 0, Msg = "查询成功！", Data = data };
+                }
+                else if(dto.PortType == 2 || dto.PortType==3)
+                {
+                    int count = _AirTicketReservations.Count;
+                    float totalPage = (float)count / dto.PageSize;//总页数
+                    if (totalPage == 0) totalPage = 1;
+                    else totalPage = (int)Math.Ceiling((double)totalPage);
+
+                    List<Grp_AirTicketReservations> grp_AirTickets = new List<Grp_AirTicketReservations>();
+                    for (int i = 0; i < dto.PageSize; i++)
+                    {
+                        var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
+                        if (RowIndex < _AirTicketReservations.Count)
+                        {
+                            grp_AirTickets.Add(_AirTicketReservations[RowIndex]);
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                    ListViewBase<Grp_AirTicketReservations> rst = new ListViewBase<Grp_AirTicketReservations>();
+                    rst.DataList = grp_AirTickets;
+                    rst.DataCount = count;
+                    rst.CurrPageIndex = dto.PageIndex;
+                    rst.CurrPageSize = dto.PageSize;
+                    var data = new
+                    {
+                        AirData= rst,
+                        AirGroupCostParameter = _AirgroupCostParameter
+                    };
+                    return result = new Result() { Code = 0, Msg = "查询成功！", Data = data };
+                }
+                else
+                {
+                    return result = new Result() { Code = -1, Msg = "请传入PortType参数！1:Web，2:Android,3:IOS！" };
+                }
             }
             else
             {