Skip to content

H
huatu_API
Commit 14c8691c authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 8a4be90b
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 6 deletions
REBORN.Repository/DataStatistics/RB_RevenueReportRepository.cs
View file @ 14c8691c
......@@ -168,13 +168,14 @@ namespace REBORN.Repository.DataStatistics
//{where}";
string sql = $@" select r.* from {nameof(RB_RevenueReport)} r
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.rb_travel_price p on r.TCID =p.TCID and r.DataType =1" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_sell" : "reborn_sell")}.RB_Ticket_Order djp on djp.OrderId =p.TCID and r.DataType =16" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Customer_HotelOrder ho on ho.OrderId =p.TCID and r.DataType =17" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Customer_TicketOrder tor on tor.OrderId =p.TCID and r.DataType =19" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Customer_CarOrder co on co.OrderId =p.TCID and r.DataType =18" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Sell_VisaOrder vo on vo.Id =p.TCID and r.DataType =3" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_sell" : "reborn_sell")}.RB_Ticket_Order djp on djp.OrderId =r.TCID and r.DataType =16" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Customer_HotelOrder ho on ho.OrderId =r.TCID and r.DataType =17" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Customer_TicketOrder tor on tor.OrderId =r.TCID and r.DataType =19" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Customer_CarOrder co on co.OrderId =r.TCID and r.DataType =18" : "")}
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Sell_VisaOrder vo on vo.Id =r.TCID and r.DataType =3" : "")}
{where}";
sql += $@" order by r.{nameof(RB_RevenueReport.StartDate)} asc";
Common.Plugin.LogHelper.Write("调试：" + sql);
return GetPage<RB_RevenueReport_Extend>(pageIndex, pageSize, out count, sql).ToList();
}
/// <summary>
......@@ -286,7 +287,19 @@ namespace REBORN.Repository.DataStatistics
}
if (model.TravelStatus > 0)
{
where += " AND p.Status =" + model.TravelStatus;
//where += " AND p.Status =" + model.TravelStatus;
if (model.TravelStatus == 1)
{
where += " AND !(p.Status =2 or djp.OrderStatus in(5,6) or ho.IsFinish=1 or tor.IsFinish=1 or co.IsFinish=1 or vo.IsFinish=1)";
}
else if (model.TravelStatus == 2)
{
where += " AND (p.Status =2 or djp.OrderStatus in(5,6) or ho.IsFinish=1 or tor.IsFinish=1 or co.IsFinish=1 or vo.IsFinish=1)";
}
else
{
where += " AND p.Status =" + model.TravelStatus;
}
}
if (model.TeamType > 0)//2023-12-02 add by:W 团队类型筛选条件； 需兼容导出； 类型： 0不限、 1常规团 、 2小包团、 3当地游
{
......@@ -310,6 +323,11 @@ namespace REBORN.Repository.DataStatistics
where += $@" AND (r.YingShou!=0 || r.ShiShou!=0 || r.TuiKuan!=0 || r.PingTaiShuiJin!=0 || r.DaiShou !=0 || r.YiShou!=0 || r.YingFu!=0 || r.ShiJiLiRun!=0 || r.TransportCost!=0)";
string sql = $@" select r.* from {nameof(RB_RevenueReport)} r
{((model.TravelStatus > 0 ) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.rb_travel_price p on r.TCID =p.TCID and r.DataType =1" : "")}
{((model.TravelStatus > 0) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_sell" : "reborn_sell")}.RB_Ticket_Order djp on djp.OrderId =r.TCID and r.DataType =16" : "")}
{((model.TravelStatus > 0) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Customer_HotelOrder ho on ho.OrderId =r.TCID and r.DataType =17" : "")}
{((model.TravelStatus > 0) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Customer_TicketOrder tor on tor.OrderId =r.TCID and r.DataType =19" : "")}
{((model.TravelStatus > 0) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Customer_CarOrder co on co.OrderId =r.TCID and r.DataType =18" : "")}
{((model.TravelStatus > 0) ? $" left join {(REBORN.Common.Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.RB_Sell_VisaOrder vo on vo.Id =r.TCID and r.DataType =3" : "")}
{where}";
//if (model.DataType == 1) ld 2019-04-23 所有排序都根据发团日期
//{
......
REBORN.Services.DataStatisticsService/FinanceStatisticsService.cs
View file @ 14c8691c
......@@ -357,6 +357,7 @@ namespace REBORN.Services.DataStatisticsService
new ExcelColumn(value:"团队编号"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"团号"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"出团状态"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"结团状态"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"操作OP"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
//new ExcelColumn(value:"领队"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
//new ExcelColumn(value:"导游"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
......@@ -627,6 +628,15 @@ namespace REBORN.Services.DataStatisticsService
{
OutTCStatusName = "未发团";
}
string FinishTCStatusName = "";
if (sitem.TravelStatus == 1)
{
FinishTCStatusName = "未结团";
}
else if (sitem.TravelStatus == 2)
{
FinishTCStatusName = "已结团";
}
ExcelDataSource firstRow = new ExcelDataSource(30)
{
......@@ -636,6 +646,7 @@ namespace REBORN.Services.DataStatisticsService
new ExcelColumn(value:(sitem.Is_Last==1?"":sitem.OrderId.ToString())){HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER},
new ExcelColumn(value:(sitem.Is_Last==1?"":(sitem.TCNUM??""))){HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER},
new ExcelColumn(value:(sitem.Is_Last==1?"":OutTCStatusName)){HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER},
new ExcelColumn(value:(sitem.Is_Last==1?"":FinishTCStatusName)){HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER},
new ExcelColumn(value:(sitem.Is_Last==1?"":sitem.OpName)){HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER},
//new ExcelColumn(value:(sitem.Is_Last==1?"":sitem.LeaderName)){HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER},
//new ExcelColumn(value:(sitem.Is_Last==1?"":sitem.GuideName)){HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment