Skip to content

H
huatu_API
Commit 17021315 authored by 吴春's avatar 吴春
Browse files
Options

11

parent 10b9b024
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 152 deletions
REBORN.Services.DMCService/TravelServiceReport.cs
View file @ 17021315
......@@ -1410,7 +1410,12 @@ namespace REBORN.Services.DMCService
//获取房间信息
var houseList = module.GetOrderHouseList(new RB_Travel_OrderHouse_Extend { TCID = ID });
List<object> result = new List<object>();
foreach (var subItem in data.Where(qitem => qitem.GroupType != OrderJoinType.SingleAirTicket))
var tempList = data.Where(qitem => qitem.GroupType != OrderJoinType.SingleAirTicket)?.OrderBy(qitem =>
{
Int32.TryParse(qitem.HouseNo, out int HouseNo);
return HouseNo;
})?.ToList();
foreach (var subItem in tempList)
{
string CreateByStr = "";
if ((subItem?.EnterID ?? 0) > 0)
......
REBORN.Services.DMCService/TravelServiceReportExport.cs
View file @ 17021315
......@@ -1858,74 +1858,6 @@ namespace REBORN.Services.DMCService
});
}
list.Add(useRoomRow);
//查询酒店信息
if (travelPrice.LineID == 14 || travelPrice.LineID == 118)
{
int hIndex = 0;
foreach (var item in hotelList)
{
ExcelDataSource hotelRow = new ExcelDataSource(cellHeight);
var columns = new List<ExcelColumn>();
if (hIndex == 0)
{
columns.Add(new ExcelColumn(value: "酒店信息:")
{
HAlignmentEnum = HAlignmentEnum.LEFT,
CellWidth = 10,
Rowspan = hotelList.Count,
FontSize = fontSize,
});
}
else
{
columns.Add(new ExcelColumn(value: ""));
}
columns.Add(new ExcelColumn(value: item.UseTime != null ? Convert.ToDateTime(item.UseTime).ToString("MMdd") : "")
{
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
columns.Add(new ExcelColumn(value: item.NewHotelRealName + " " + item.NewHotelTel)
{
HAlignmentEnum = HAlignmentEnum.LEFT,
Colspan = 8,
FontSize = fontSize,
});
var danJian = item.OrderDetailsList.Where(qitem => qitem.HouseType == 1).FirstOrDefault()?.HouseNum;
var shuangrenjian = item.OrderDetailsList.Where(qitem => qitem.HouseType == 2).FirstOrDefault()?.HouseNum;
var dachuang = item.OrderDetailsList.Where(qitem => qitem.HouseType == 3).FirstOrDefault()?.HouseNum;
var sanrenjian = item.OrderDetailsList.Where(qitem => qitem.HouseType == 4).FirstOrDefault()?.HouseNum;
var sijidaoyou = item.OrderDetailsList.Where(qitem => qitem.HouseType == 5).FirstOrDefault()?.HouseNum;
string hotelStr = "";
if (danJian != null && danJian > 0)
{
hotelStr += " SGL:" + Convert.ToInt32(danJian);
}
if (shuangrenjian != null && shuangrenjian > 0)
{
hotelStr += " TWN:" + Convert.ToInt32(shuangrenjian);
}
if (dachuang != null && dachuang > 0)
{
hotelStr += " DBL:" + Convert.ToInt32(dachuang);
}
if (sanrenjian != null && sanrenjian > 0)
{
hotelStr += " TRP:" + Convert.ToInt32(sanrenjian);
}
columns.Add(new ExcelColumn(value: hotelStr)
{
HAlignmentEnum = HAlignmentEnum.LEFT,
Colspan = 7,
FontSize = fontSize,
});
hotelRow.ExcelRows = columns;
list.Add(hotelRow);
hIndex++;
}
}
#endregion
#region 旅客信息
......@@ -2034,23 +1966,19 @@ namespace REBORN.Services.DMCService
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
if (travelPrice.LineID == 14 || travelPrice.LineID == 118)
{
foreach (var item in hotelList)
{
header.ExcelRows.Add(new ExcelColumn(value: item.UseTime != null ? Convert.ToDateTime(item.UseTime).ToString("MM/dd") : "")
{
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
}
}
list.Add(header);
int number = 1;
int roomNum = 1;
var leaderModel = travelGuestList.Where(qitem => qitem.IsLeaderOrder == 1)?.FirstOrDefault();
//排除自由行和单机票
var subList = travelGuestList.Where(qitem => qitem.GroupType != OrderJoinType.SingleAirTicket).GroupBy(qitem => qitem.HouseNo).Select(qitem => new { qitem.Key, Num = qitem.Count() });
var subList = travelGuestList.Where(qitem => qitem.GroupType != OrderJoinType.SingleAirTicket).GroupBy(qitem => qitem.HouseNo)
.OrderBy(qitem =>
{
Int32.TryParse(qitem.Key, out int HouseNum);
return HouseNum;
})
.Select(qitem => new { qitem.Key, Num = qitem.Count() });
foreach (var rootItem in subList)
{
var childList = travelGuestList.Where(qitem => qitem.HouseNo == rootItem.Key).ToList();
......@@ -2072,7 +2000,7 @@ namespace REBORN.Services.DMCService
}
if (childIndex == 0)
{
excelColum.Add(new ExcelColumn(value: roomNum.ToString())
excelColum.Add(new ExcelColumn(value: HouseNo.ToString())
{
HAlignmentEnum = HAlignmentEnum.CENTER,
Rowspan = rootItem.Num,
......@@ -2167,18 +2095,6 @@ namespace REBORN.Services.DMCService
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
if (travelPrice.LineID == 14 || travelPrice.LineID == 118)
{
excelColum.Add(new ExcelColumn() { Value = "" });
foreach (var hItem in hotelList)
{
excelColum.Add(new ExcelColumn(value: "")
{
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
}
}
data.ExcelRows = excelColum;
list.Add(data);
number++;
......@@ -2206,7 +2122,7 @@ namespace REBORN.Services.DMCService
}
if (childIndex == 0)
{
excelColum.Add(new ExcelColumn(value: roomNum.ToString())
excelColum.Add(new ExcelColumn(value: HouseNo.ToString())
{
HAlignmentEnum = HAlignmentEnum.CENTER,
Rowspan = rootItem.Num,
......@@ -2301,18 +2217,7 @@ namespace REBORN.Services.DMCService
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
if (travelPrice.LineID == 14 || travelPrice.LineID == 118)
{
excelColum.Add(new ExcelColumn() { Value = "" });
foreach (var hItem in hotelList)
{
excelColum.Add(new ExcelColumn(value: "")
{
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
}
}
data.ExcelRows = excelColum;
list.Add(data);
number++;
......@@ -2330,7 +2235,7 @@ namespace REBORN.Services.DMCService
}
if (childIndex == 0)
{
excelColum.Add(new ExcelColumn(value: roomNum.ToString())
excelColum.Add(new ExcelColumn(value: HouseNo.ToString())
{
HAlignmentEnum = HAlignmentEnum.CENTER,
Rowspan = rootItem.Num,
......@@ -2401,7 +2306,7 @@ namespace REBORN.Services.DMCService
}
if (childList.Count == 1)
{
houseTypeStr = "单间 T/L";
houseTypeStr = "单间T/L";
}
excelColum.Add(new ExcelColumn(value: houseTypeStr)
{
......@@ -2429,18 +2334,6 @@ namespace REBORN.Services.DMCService
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
if (travelPrice.LineID == 14 || travelPrice.LineID == 118)
{
excelColum.Add(new ExcelColumn() { Value = "" });
foreach (var hItem in hotelList)
{
excelColum.Add(new ExcelColumn(value: "")
{
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
}
}
data.ExcelRows = excelColum;
list.Add(data);
number++;
......@@ -2451,8 +2344,8 @@ namespace REBORN.Services.DMCService
List<ExcelColumn> guideRow = new List<ExcelColumn>()
{
new ExcelColumn (value:roomNum.ToString()){ HAlignmentEnum = HAlignmentEnum.LEFT, FontSize = fontSize,},
new ExcelColumn (value:number.ToString()){ HAlignmentEnum = HAlignmentEnum.LEFT, FontSize = fontSize,},
new ExcelColumn (value:roomNum.ToString()){ HAlignmentEnum = HAlignmentEnum.CENTER, FontSize = fontSize,},
new ExcelColumn (value:number.ToString()){ HAlignmentEnum = HAlignmentEnum.CENTER, FontSize = fontSize,},
new ExcelColumn (value:"导游"){ HAlignmentEnum = HAlignmentEnum.LEFT, FontSize = fontSize,},
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
......@@ -2461,7 +2354,7 @@ namespace REBORN.Services.DMCService
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:"单间 T/G"){ HAlignmentEnum = HAlignmentEnum.LEFT, FontSize = fontSize,},
new ExcelColumn (value:"单间T/G"){ HAlignmentEnum = HAlignmentEnum.LEFT, FontSize = fontSize,},
};
if (travelPrice.OutGroupType == 1)
{
......@@ -2472,18 +2365,7 @@ namespace REBORN.Services.DMCService
guideRow.Add(new ExcelColumn() { Value = "" });
}
guideRow.Add(new ExcelColumn() { Value = "" });
if (travelPrice.LineID == 14 || travelPrice.LineID == 118)
{
guideRow.Add(new ExcelColumn() { Value = "" });
foreach (var hItem in hotelList)
{
guideRow.Add(new ExcelColumn(value: "")
{
HAlignmentEnum = HAlignmentEnum.LEFT,
FontSize = fontSize,
});
}
}
list.Add(new ExcelDataSource(cellHeight)
{
ExcelRows = guideRow
......@@ -2494,8 +2376,8 @@ namespace REBORN.Services.DMCService
List<ExcelColumn> dirverRow = new List<ExcelColumn>()
{
new ExcelColumn (value:roomNum.ToString()){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:number.ToString()){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:roomNum.ToString()){ HAlignmentEnum = HAlignmentEnum.CENTER},
new ExcelColumn (value:number.ToString()){ HAlignmentEnum = HAlignmentEnum.CENTER},
new ExcelColumn (value:"司机"){ HAlignmentEnum = HAlignmentEnum.LEFT, FontSize = fontSize,},
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
......@@ -2504,7 +2386,7 @@ namespace REBORN.Services.DMCService
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:""){ HAlignmentEnum = HAlignmentEnum.LEFT},
new ExcelColumn (value:"单间 T/D"){ HAlignmentEnum = HAlignmentEnum.LEFT, FontSize = fontSize,},
new ExcelColumn (value:"单间T/D"){ HAlignmentEnum = HAlignmentEnum.LEFT, FontSize = fontSize,},
};
if (travelPrice.OutGroupType == 1)
{
......@@ -2515,17 +2397,6 @@ namespace REBORN.Services.DMCService
dirverRow.Add(new ExcelColumn() { Value = "" });
}
dirverRow.Add(new ExcelColumn() { Value = "" });
if (travelPrice.LineID == 14 || travelPrice.LineID == 118)
{
dirverRow.Add(new ExcelColumn() { Value = "" });
foreach (var hItem in hotelList)
{
dirverRow.Add(new ExcelColumn(value: "")
{
HAlignmentEnum = HAlignmentEnum.LEFT,
});
}
}
list.Add(new ExcelDataSource(cellHeight)
{
ExcelRows = dirverRow
......@@ -2533,7 +2404,6 @@ namespace REBORN.Services.DMCService
});
}
#endregion
return list;
}
......
REBORN.Services.SellService/SellOrderService.cs
View file @ 17021315
......@@ -9829,7 +9829,11 @@ namespace REBORN.Services.SellService
price.TCID,
CoverImg,
OrderBackScenicList = orderBackScenicList?.Select(x => new { x.Id, x.Number, x.BackMoney, x.CouponsName, x.CouponsId, GuestBackScenicName = (x.GuestBlackList != null && x.GuestBlackList.Any()) ? string.Join("、", x.GuestBlackList.Select(z => z.GuestName)) : "" }),
list = list.Select(x => new
list = list?.OrderBy(qitem =>
{
Int32.TryParse(qitem.HouseNo, out int HouseNo);
return HouseNo;
})?.Select(x => new
{
x.GuestSurveyID,
ScoreNum = x.ScoreNum.ToString("#0.00"),
......
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