|
@@ -91,6 +91,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
};
|
|
|
dynamics.Add(AirGW);
|
|
|
|
|
|
+ var AirTDC = new
|
|
|
+ {
|
|
|
+ Type = "TDC",
|
|
|
+ Price = eec.AirTD
|
|
|
+ };
|
|
|
+ dynamics.Add(AirTDC);
|
|
|
+
|
|
|
List<Grp_DayAndCost> dac1 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 1 && x.NationalTravelFeeId > 0 && x.IsDel == 0).ToList();
|
|
|
List<Grp_DayAndCost> dac2 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 2 && x.NationalTravelFeeId > 0 && x.IsDel == 0).ToList();
|
|
|
List<Grp_DayAndCost> dac3 = (from item in _sqlSugar.Queryable<Grp_DayAndCost>()
|
|
@@ -288,12 +295,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
decimal AirJJCTotal = 0;
|
|
|
decimal AirGWCTotal = 0;
|
|
|
+ decimal AirTDCTotal = 0;
|
|
|
|
|
|
|
|
|
if (eec.ChoiceOne == 1)
|
|
|
{
|
|
|
AirJJCTotal += Math.Round((eec.InsidePay), 2);
|
|
|
AirGWCTotal += Math.Round((eec.InsidePay), 2);
|
|
|
+ AirTDCTotal += Math.Round((eec.InsidePay), 2);
|
|
|
}
|
|
|
|
|
|
if (eec.SumJJC == 1)
|
|
@@ -304,12 +313,17 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{
|
|
|
AirGWCTotal += Math.Round((eec.OutsideGWPay), 2);
|
|
|
}
|
|
|
+ if (eec.SumTDC == 1)
|
|
|
+ {
|
|
|
+ AirTDCTotal += Math.Round((eec.OutsideTDPay), 2);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
if (eec.ChoiceThree == 1)
|
|
|
{
|
|
|
AirJJCTotal += Math.Round(SumHotel, 2);
|
|
|
AirGWCTotal += Math.Round(SumHotel, 2);
|
|
|
+ AirTDCTotal += Math.Round(SumHotel, 2);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -317,6 +331,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{
|
|
|
AirJJCTotal += Math.Round(SumMeals, 2);
|
|
|
AirGWCTotal += Math.Round(SumMeals, 2);
|
|
|
+ AirTDCTotal += Math.Round(SumMeals, 2);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -324,6 +339,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{
|
|
|
AirJJCTotal += Math.Round(SumGongZa, 2);
|
|
|
AirGWCTotal += Math.Round(SumGongZa, 2);
|
|
|
+ AirTDCTotal += Math.Round(SumGongZa, 2);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -342,6 +358,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
};
|
|
|
dynamics.Add(SumAirGWC);
|
|
|
|
|
|
+
|
|
|
+ var SumAirTDC = new
|
|
|
+ {
|
|
|
+ Type = "SumAirTDC",
|
|
|
+ Price = AirTDCTotal
|
|
|
+ };
|
|
|
+ dynamics.Add(SumAirTDC);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
catch (Exception)
|