1

REBORN.Repository/DataStatistics/RB_RevenueReportRepository.cs

@@ -128,11 +128,11 @@ namespace REBORN.Repository.DataStatistics
                 //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 to.IsFinish=1 or co.IsFinish=1 or vo.IsFinish=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 to.IsFinish=1 or co.IsFinish=1 or vo.IsFinish=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
                 {
@@ -170,7 +170,7 @@ namespace REBORN.Repository.DataStatistics
 {((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 to on to.OrderId =p.TCID and r.DataType =19" : "")}
+{((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" : "")}
 {where}";