Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Infrastructure/Repositories/Groups/GroupCostParameterRepository.cs

@@ -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)