1

REBORN.Repository/DataStatistics/RB_RevenueReportRepository.cs

@@ -128,7 +128,7 @@ 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 tor.IsFinish=1 or co.IsFinish=1 or vo.IsFinish=1)";
+                    where += "AND (IFNULL(p.Status,0) <>2 and IFNULL(djp.OrderStatus,0) not in(5,6) and IFNULL(ho.IsFinish,0)<>1 and IFNULL(tor.IsFinish,0)<>1 and IFNULL(co.IsFinish,0)<>1 and IFNULL(vo.IsFinish,0)<>1) ";
                 }
                 else if (model.TravelStatus == 2)
                 {
@@ -175,7 +175,7 @@ namespace REBORN.Repository.DataStatistics
 {((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);
+            //Common.Plugin.LogHelper.Write("调试：" + sql);
             return GetPage<RB_RevenueReport_Extend>(pageIndex, pageSize, out count, sql).ToList();
         }
         /// <summary>
@@ -290,7 +290,7 @@ 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 tor.IsFinish=1 or co.IsFinish=1 or vo.IsFinish=1)";
+                    where += " AND (IFNULL(p.Status,0) <>2 and IFNULL(djp.OrderStatus,0) not in(5,6) and IFNULL(ho.IsFinish,0)<>1 and IFNULL(tor.IsFinish,0)<>1 and IFNULL(co.IsFinish,0)<>1 and IFNULL(vo.IsFinish,0)<>1) ";
                 }
                 else if (model.TravelStatus == 2)
                 {

REBORN.Services.DataStatisticsService/FinanceStatisticsService.cs

@@ -357,7 +357,6 @@ 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 },
@@ -628,15 +627,6 @@ namespace REBORN.Services.DataStatisticsService
                         {
                             OutTCStatusName = "未发团";
                         }
-                        string FinishTCStatusName = "";
-                        if (sitem.TravelStatus == 1)
-                        {
-                            FinishTCStatusName = "未结团";
-                        }
-                        else if (sitem.TravelStatus == 2)
-                        {
-                            FinishTCStatusName = "已结团";
-                        }
 
                         ExcelDataSource firstRow = new ExcelDataSource(30)
                         {
@@ -646,7 +636,6 @@ 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},