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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4220,6 +4220,32 @@ namespace OASystem.API.Controllers
                             dic.Add("OtherFeeStr", otherFeeStr);
                         }
 
+                        //总计
+                        decimal allPrice = dac1totalPrice + dac2totalPrice + _EnterExitCosts.CityTranffic + _EnterExitCosts.Visa + _EnterExitCosts.Safe + _EnterExitCosts.Ticket;
+                        
+                        //国际旅费
+
+                        string outsideJJ = "";
+                        string allPriceJJ = "";
+                        if (_EnterExitCosts.SumJJC == 1) {
+                            outsideJJ = string.Format(@"经济舱:{0} 元/人", _EnterExitCosts.OutsideJJPay.ToString("#0.00"));
+                            allPriceJJ = string.Format(@"经济舱:{0} 元/人", (allPrice + _EnterExitCosts.OutsideJJPay).ToString("#0.00"));
+                        }
+                        string outsideGW = "";
+                        string allPriceGW = "";
+                        if (_EnterExitCosts.SumGWC == 1) {
+                            outsideGW = string.Format(@"公务舱:{0}    元/人", _EnterExitCosts.OutsaideGWPay.ToString("#0.00"));
+                            allPriceGW = string.Format(@"公务舱:{0}   元/人", (allPrice + _EnterExitCosts.OutsaideGWPay).ToString("#0.00"));
+                        }
+
+                        if (_EnterExitCosts.SumJJC == 1 || _EnterExitCosts.SumGWC == 1)
+                        {
+                            string InTravelPriceStr = string.Format(@" ({0}    {1})", outsideJJ, outsideGW);
+                            dic.Add("InTravelPrice", InTravelPriceStr);
+
+                            string FinalSumPriceStr = string.Format(@" ({0}    {1})", allPriceJJ, allPriceGW);
+                            dic.Add("FinalSumPrice", FinalSumPriceStr);
+                        }
 
                         //dic.Add("VisaPay", _EnterExitCosts.Visa.ToString("#0.00"));
                         //dic.Add("SafePay", _EnterExitCosts.Safe.ToString("#0.00"));