1、出入境费用明细-->出国出境经费审核计算明细报表更改

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4601,28 +4601,34 @@ namespace OASystem.API.Controllers
                             dic.Add("Row1Str", row1);
                         }
 
+
+                        string airTotalStr = string.Empty,
+                               airPriceStr = string.Empty;
                         //经济舱
                         if (_EnterExitCosts.SumJJC == 1)
                         {
-                            dic.Add("OutsideJJ", _EnterExitCosts.OutsideJJPay.ToString("#0.00"));
-                            dic.Add("AirJJ", _EnterExitCosts.AirJJ.ToString("#0.00"));
-                            
+                            airTotalStr += $"{_EnterExitCosts.OutsideJJPay.ToString("#0.00")}元/人（经济舱）";
+                            airPriceStr += $"{_EnterExitCosts.AirJJ.ToString("#0.00")}元/人（经济舱）";
                         }
                         //公务舱
                         if (_EnterExitCosts.SumGWC == 1)
                         {
-                            dic.Add("OutsaideGW", _EnterExitCosts.OutsaideGWPay.ToString("#0.00"));
-                            dic.Add("AirGW", _EnterExitCosts.AirGW.ToString("#0.00"));
+                            airTotalStr += $" {_EnterExitCosts.OutsaideGWPay.ToString("#0.00")} 元/人（公务舱）";
+                            airPriceStr += $" {_EnterExitCosts.AirGW.ToString("#0.00")} 元/人（公务舱）";
                         }
-
-                        if (_EnterExitCosts.SumGWC == 1 || _EnterExitCosts.SumJJC == 1)
+                        //头等舱
+                        if (_EnterExitCosts.SumTD == 1)
                         {
-                            if (_EnterExitCosts.CityTranffic != 0)
-                            {
-                                dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
-                            }
+                            airTotalStr += $" {_EnterExitCosts.OutsideTDPay.ToString("#0.00")} 元/人（头等舱）";
+                            airPriceStr += $" {_EnterExitCosts.AirTD.ToString("#0.00")} 元/人（头等舱）";
                         }
 
+
+                        dic.Add("AirTotalStr", airTotalStr);
+                        dic.Add("AirPriceStr", airPriceStr);
+                        dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
+
+
                         NodeCollection allTables = doc.GetChildNodes(NodeType.Table, true);
                         Aspose.Words.Tables.Table table1 = allTables[0] as Aspose.Words.Tables.Table;
                         int table1Row = 0,
@@ -4829,12 +4835,22 @@ namespace OASystem.API.Controllers
                         {
                             table4.Rows.RemoveAt(table4Row);
                         }
+                        decimal otherFeeTotal = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal;
 
-                        decimal subJJC = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsideJJPay;
-                        dic.Add("SubJJC", subJJC.ToString("#0.00"));
+                        decimal subJJC = 0.00M,
+                                subGWC = 0.00M,
+                                subTDC = 0.00M;
 
-                        decimal subGWC = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsaideGWPay;
+                        //经济舱
+                        if (_EnterExitCosts.SumJJC == 1) subJJC = otherFeeTotal + _EnterExitCosts.OutsideJJPay;
+                        //公务舱
+                        if (_EnterExitCosts.SumGWC == 1) subGWC = otherFeeTotal + _EnterExitCosts.OutsaideGWPay;
+                        //头等舱
+                        if (_EnterExitCosts.SumTD == 1) subTDC = otherFeeTotal + _EnterExitCosts.OutsideTDPay;
+
+                        dic.Add("SubJJC", subJJC.ToString("#0.00"));
                         dic.Add("SubGWC", subGWC.ToString("#0.00"));
+                        dic.Add("SubTDC", subTDC.ToString("#0.00"));
 
                         #region 填充word模板书签内容
                         foreach (var key in dic.Keys)