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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4601,28 +4601,33 @@ 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.OutsideGWPay.ToString("#0.00")} 元/人（公务舱）";
+                            airPriceStr += $" {_EnterExitCosts.AirGW.ToString("#0.00")} 元/人（公务舱）";
                         }
-
-                        if (_EnterExitCosts.SumGWC == 1 || _EnterExitCosts.SumJJC == 1)
+                        //头等舱
+                        if (_EnterExitCosts.SumTDC == 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 +4834,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.OutsideGWPay;
+                        //头等舱
+                        if (_EnterExitCosts.SumTDC == 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)
@@ -5035,30 +5050,31 @@ namespace OASystem.API.Controllers
                         decimal allPrice = dac1totalPrice + dac2totalPrice + _EnterExitCosts.Visa + _EnterExitCosts.Safe + _EnterExitCosts.Ticket;
 
                         //国际旅费
-                        string outsideJJ = "";
-                        string allPriceJJ = "";
+                        string outsideAir = string.Empty;
+                        string allPriceAir = string.Empty;
                         if (_EnterExitCosts.SumJJC == 1)
                         {
-                            outsideJJ = string.Format(@"经济舱:{0} 元/人", _EnterExitCosts.AirJJ.ToString("#0.00"));
-                            allPriceJJ = string.Format(@"经济舱:{0} 元/人", (allPrice + _EnterExitCosts.OutsideJJPay).ToString("#0.00"));
+                            outsideAir += string.Format(@"经济舱:{0} 元/人;", _EnterExitCosts.AirJJ.ToString("#0.00"));
+                            allPriceAir += string.Format(@"经济舱:{0} 元/人;", (allPrice + _EnterExitCosts.OutsideJJPay).ToString("#0.00"));
                         }
-                        string outsideGW = "";
-                        string allPriceGW = "";
+
                         if (_EnterExitCosts.SumGWC == 1)
                         {
-                            outsideGW = string.Format(@"公务舱:{0} 元/人", _EnterExitCosts.AirGW.ToString("#0.00"));
-                            allPriceGW = string.Format(@"公务舱:{0} 元/人", (allPrice + _EnterExitCosts.OutsaideGWPay).ToString("#0.00"));
+                            outsideAir += string.Format(@"公务舱:{0} 元/人;", _EnterExitCosts.AirGW.ToString("#0.00"));
+                            allPriceAir += string.Format(@"公务舱:{0} 元/人;", (allPrice + _EnterExitCosts.OutsideGWPay).ToString("#0.00"));
                         }
 
-                        if (_EnterExitCosts.SumJJC == 1 || _EnterExitCosts.SumGWC == 1)
+                        if (_EnterExitCosts.SumTDC == 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);
+                            outsideAir += string.Format(@"头等舱:{0} 元/人;", _EnterExitCosts.AirTD.ToString("#0.00"));
+                            allPriceAir += string.Format(@"头等舱:{0} 元/人;", (allPrice + _EnterExitCosts.OutsideTDPay).ToString("#0.00"));
                         }
 
+                        dic.Add("InTravelPrice", $"({outsideAir})");
+
+                        dic.Add("FinalSumPrice", $"({allPriceAir})");
+
+
                         //dic.Add("VisaPay", _EnterExitCosts.Visa.ToString("#0.00"));
                         //dic.Add("SafePay", _EnterExitCosts.Safe.ToString("#0.00"));
                         //dic.Add("YiMiao", _EnterExitCosts.YiMiao.ToString("#0.00"));
@@ -5070,7 +5086,7 @@ namespace OASystem.API.Controllers
                         }
 
                         //模板文件名
-                        string strFileName = $"{_DelegationInfo.TeamName}因公出国（境）经费测算明细表.docx";
+                        string strFileName = $"{_DelegationInfo.TeamName}因公出国（境）经费测算明细表{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.docx";
                         doc.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
                         return Ok(JsonView(true, "成功", new { Url = url }));
@@ -5237,8 +5253,12 @@ namespace OASystem.API.Controllers
                         designer.SetDataSource("cityTranffic", @$"其中：国外城市间机票费: {_EnterExitCosts.CityTranffic.ToString("#0.00")} 元");
                         designer.SetDataSource("sumCityTranffic", @$"{_EnterExitCosts.CityTranffic.ToString("#0.00")} ");
 
+                        string cell4Str1 = string.Empty;
+                        if (_EnterExitCosts.SumJJC == 1) cell4Str1 += $"经济舱：{_EnterExitCosts.AirJJ.ToString("#0.00")} 元/人;";
+                        if (_EnterExitCosts.SumGWC == 1) cell4Str1 += $"公务舱：{_EnterExitCosts.AirGW.ToString("#0.00")} 元/人;";
+                        if (_EnterExitCosts.SumTDC == 1) cell4Str1 += $"公务舱：{_EnterExitCosts.AirTD.ToString("#0.00")} 元/人;";
+                        string cell4Str = $"  4.国际旅费：{cell4Str1}";
 
-                        string cell4Str = $"  4.国际旅费：经济舱：{_EnterExitCosts.AirJJ.ToString("#0.00")} 元/人,公务舱：{_EnterExitCosts.AirGW.ToString("#0.00")} 元/人";
                         string cellStr = $"  5.其他费用（";
                         if (_EnterExitCosts.Visa > 0) cellStr += $"签证费：{_EnterExitCosts.Visa.ToString("#0.00")}元，";
                         if (_EnterExitCosts.YiMiao > 0) cellStr += $"疫苗费：{_EnterExitCosts.YiMiao.ToString("#0.00")}元，";
@@ -5254,10 +5274,10 @@ namespace OASystem.API.Controllers
 
 
                         decimal otherFee = _EnterExitCosts.Visa + _EnterExitCosts.YiMiao + _EnterExitCosts.HeSuan + _EnterExitCosts.Safe + _EnterExitCosts.Ticket + _EnterExitCosts.Service;
-                        decimal s = dac1totalPrice + dac2totalPrice + _EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsaideGWPay + otherFee;
+                        decimal s = dac1totalPrice + dac2totalPrice + _EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsideGWPay + otherFee;
 
                         decimal pxFee = dac4.Sum(it => it.Cost);
-                        decimal glvFee = _EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsaideGWPay;
+                        decimal glvFee = _EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsideGWPay;
                         string celllastStr1 = "";
                         if (dac1totalPrice > 0) celllastStr1 += $"住宿费 {dac1totalPrice.ToString("#0.00")} 元";
                         if (dac2totalPrice > 0) celllastStr1 += $"，伙食费和公杂费 {dac2totalPrice.ToString("#0.00")} 元";
@@ -5270,7 +5290,7 @@ namespace OASystem.API.Controllers
                         designer.SetDataSource("cell4Str", cell4Str);
                         designer.SetDataSource("cellStr", cellStr);
                         designer.SetDataSource("cellSum", (_EnterExitCosts.Visa + _EnterExitCosts.Safe).ToString("#0.00"));
-                        designer.SetDataSource("cellSum4", (_EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsaideGWPay).ToString("#0.00"));
+                        designer.SetDataSource("cellSum4", (_EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsideGWPay).ToString("#0.00"));
                         designer.SetDataSource("celllastStr", celllastStr);
 
                         Workbook wb = designer.Workbook;
@@ -5307,7 +5327,7 @@ namespace OASystem.API.Controllers
                         wb.CalculateFormula(true);
 
                         //模板文件名
-                        string strFileName = $"{_DelegationInfo.TeamName}-四川省商务厅出国经费财政先行审核表{DateTime.Now.ToString("yyyyMMddHHmmss")}.xls"; ;//$".xls";
+                        string strFileName = $"{_DelegationInfo.TeamName}-四川省商务厅出国经费财政先行审核表{DateTime.Now.ToString("yyyyMMddHHmmss")}.xls"; 
                         designer.Workbook.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
                         return Ok(JsonView(true, "成功", new { Url = url }));
@@ -5595,7 +5615,6 @@ namespace OASystem.API.Controllers
                         NodeCollection allTables = doc.GetChildNodes(NodeType.Table, true);
                         Aspose.Words.Tables.Table table1 = allTables[0] as Aspose.Words.Tables.Table;
 
-
                         int accommodationStartIndex = 6;
                         decimal dac1totalPrice = 0.00M;
                         foreach (var dac in dac1)
@@ -5633,12 +5652,8 @@ namespace OASystem.API.Controllers
                             dac1totalPrice += rbmPrice;
                         }
 
-
-
-
                         dic.Add("dac1totalPrice", dac1totalPrice.ToString("#0.00"));
 
-
                         builder.MoveToCell(0, accommodationStartIndex, 1, 0);
                         builder.Write("小计");
                         builder.MoveToCell(0, accommodationStartIndex, 8, 0);
@@ -5654,8 +5669,8 @@ namespace OASystem.API.Controllers
                         //    int rowIndex = accommodationStartIndex;
                         //    for (int i = 0; i < nullRow; i++)
                         //    {
-                        //        Row row = table1.Rows[rowIndex];
-                        //        row.Remove();        
+                        //        Aspose.Words.Tables.Row row = table1.Rows[rowIndex];
+                        //        row.Remove();
                         //        rowIndex++;
                         //    }
                         //}
@@ -5705,15 +5720,16 @@ namespace OASystem.API.Controllers
                         }
 
                         dic.Add("dac2totalPrice", dac2totalPrice.ToString("#0.00"));
+
+                        Aspose.Words.Tables.Table table2 = allTables[1] as Aspose.Words.Tables.Table;
                         //删除空行
-                        if (dac2.Count < foodandotherRows)
-                        {
-                            //int nullRow = accommodationRows - dac2.Count;
-                            //while (table2.Rows.Count > dac2.Count)
-                            //{
-                            //    table2.Rows.RemoveAt(dac2.Count);
-                            //}
-                        }
+                        //if (dac2.Count < foodandotherRows)
+                        //{
+                        //    while (table2.Rows.Count > dac2.Count)
+                        //    {
+                        //        table2.Rows.RemoveAt(dac2.Count);
+                        //    }
+                        //}
 
                         dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
 
@@ -5736,7 +5752,7 @@ namespace OASystem.API.Controllers
                             builder.Write(dic[key]);
                         }
                         //模板文件名
-                        string strFileName = $"省级单位出(境)经费报销单.docx";
+                        string strFileName = $"省级单位出(境)经费报销单{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.docx";
                         doc.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
                         return Ok(JsonView(true, "成功", new { Url = url }));

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1871,14 +1871,24 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
 
             if (oaInfo != null)
             {
-                if (!string.IsNullOrEmpty(oaInfo.ScreenshotOfMailUrl))
+                string urlJson = oaInfo.ScreenshotOfMailUrl ?? "";
+                if (!string.IsNullOrEmpty(urlJson))
                 {
-                    var urls = JsonConvert.DeserializeObject<List<string>>(oaInfo.ScreenshotOfMailUrl);
+                    List<string> urls = JsonConvert.DeserializeObject<List<string>>(urlJson);
 
                     var filePath = urls.Find(x => x.Contains(dto.FileName));
-                    if (!string.IsNullOrEmpty(filePath)) { }
-                    else return Ok(JsonView(false, "文件不存在！"));
+                    if (string.IsNullOrEmpty(filePath)) return Ok(JsonView(false, "文件不存在！"));
 
+                    var updFile = urls.Remove(filePath);
+                    if (updFile)
+                    {
+                        string urlJsonstr = JsonConvert.SerializeObject(urls);
+                        var upd = await _sqlSugar.Updateable<Res_OfficialActivities>()
+                                                 .SetColumns(x => x.ScreenshotOfMailUrl == urlJsonstr)
+                                                 .Where(x => x.Id == dto.Id)
+                                                 .ExecuteCommandAsync();
+                        if (upd > 0) return Ok(JsonView(true, "操作成功！"));
+                    }
                 }
             }
 

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -3080,7 +3080,7 @@ namespace OASystem.API.OAMethodLib
                         dic.Add("Row1Str", row1);
 
                         dic.Add("OutsideJJ", _EnterExitCosts.OutsideJJPay.ToString("#0.00"));
-                        dic.Add("OutsaideGW", _EnterExitCosts.OutsaideGWPay.ToString("#0.00"));
+                        dic.Add("OutsaideGW", _EnterExitCosts.OutsideGWPay.ToString("#0.00"));
                         dic.Add("AirJJ", _EnterExitCosts.AirJJ.ToString("#0.00"));
                         dic.Add("AirGW", _EnterExitCosts.AirGW.ToString("#0.00"));
                         dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
@@ -3092,7 +3092,7 @@ namespace OASystem.API.OAMethodLib
                         //dic.Add("SubPX", tainFeeTotal.ToString("#0.00"));
 
                         decimal subJJC = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsideJJPay;
-                        decimal subGWC = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsaideGWPay;
+                        decimal subGWC = insidePayTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsideGWPay;
                         dic.Add("SubJJC", subJJC.ToString("#0.00"));
                         dic.Add("SubGWC", subGWC.ToString("#0.00"));
 
@@ -3458,7 +3458,7 @@ namespace OASystem.API.OAMethodLib
                         if (_EnterExitCosts.SumGWC == 1)
                         {
                             outsideGW = string.Format(@"公务舱:{0} 元/人", _EnterExitCosts.AirGW.ToString("#0.00"));
-                            allPriceGW = string.Format(@"公务舱:{0} 元/人", (allPrice + _EnterExitCosts.OutsaideGWPay).ToString("#0.00"));
+                            allPriceGW = string.Format(@"公务舱:{0} 元/人", (allPrice + _EnterExitCosts.OutsideGWPay).ToString("#0.00"));
                         }
 
                         if (_EnterExitCosts.SumJJC == 1 || _EnterExitCosts.SumGWC == 1)
@@ -3668,10 +3668,10 @@ namespace OASystem.API.OAMethodLib
 
 
                         decimal otherFee = _EnterExitCosts.Visa + _EnterExitCosts.YiMiao + _EnterExitCosts.HeSuan + _EnterExitCosts.Safe + _EnterExitCosts.Ticket + _EnterExitCosts.Service;
-                        decimal s = dac1totalPrice + dac2totalPrice + _EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsaideGWPay + otherFee;
+                        decimal s = dac1totalPrice + dac2totalPrice + _EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsideGWPay + otherFee;
 
                         decimal pxFee = dac4.Sum(it => it.Cost);
-                        decimal glvFee = _EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsaideGWPay;
+                        decimal glvFee = _EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsideGWPay;
                         string celllastStr1 = "";
                         if (dac1totalPrice > 0) celllastStr1 += $"住宿费 {dac1totalPrice.ToString("#0.00")} 元";
                         if (dac2totalPrice > 0) celllastStr1 += $"，伙食费和公杂费 {dac2totalPrice.ToString("#0.00")} 元";
@@ -3684,7 +3684,7 @@ namespace OASystem.API.OAMethodLib
                         designer.SetDataSource("cell4Str", cell4Str);
                         designer.SetDataSource("cellStr", cellStr);
                         designer.SetDataSource("cellSum", (_EnterExitCosts.Visa + _EnterExitCosts.Safe).ToString("#0.00"));
-                        designer.SetDataSource("cellSum4", (_EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsaideGWPay).ToString("#0.00"));
+                        designer.SetDataSource("cellSum4", (_EnterExitCosts.OutsideJJPay + _EnterExitCosts.OutsideGWPay).ToString("#0.00"));
                         designer.SetDataSource("celllastStr", celllastStr);
 
                         Workbook wb = designer.Workbook;

OASystem/OASystem.Domain/Dtos/Groups/EnterExitCostDto.cs

@@ -124,7 +124,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         ///  国际旅费合计（公务舱）
         /// </summary>
-        public decimal OutsaideGWPay { get; set; }
+        public decimal OutsideGWPay { get; set; }
 
         /// <summary>
         /// 国际旅费合计（头等舱）

OASystem/OASystem.Domain/Entities/Groups/Grp_EnterExitCost.cs

@@ -81,7 +81,7 @@ namespace OASystem.Domain.Entities.Groups
         ///  国际旅费合计（公务舱）
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
-        public decimal OutsaideGWPay { get; set; }
+        public decimal OutsideGWPay { get; set; }
 
         /// <summary>
         /// 国际旅费合计（头等舱）
@@ -191,7 +191,7 @@ namespace OASystem.Domain.Entities.Groups
         ///  头等舱小计选择框
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int SumTD { get; set; }
+        public int SumTDC { get; set; }
 
         /// <summary>
         ///  住宿费合计选择框

OASystem/OASystem.Domain/ViewModels/Groups/EnterExitCostView.cs

@@ -311,7 +311,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         ///  国际旅费合计（公务舱）
         /// </summary>
-        public decimal OutsaideGWPay { get; set; }
+        public decimal OutsideGWPay { get; set; }
 
 
         /// <summary>
@@ -379,7 +379,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         ///  头等舱小计选择框
         /// </summary>
-        public int SumTD { get; set; }
+        public int SumTDC { get; set; }
 
         /// <summary>
         ///  住宿费合计选择框

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -140,7 +140,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             Result result = new Result() { Code = -1, Msg = "操作失败!" };
 
             if (dto.SumJJC == 0) dto.OutsideJJPay = 0;
-            if (dto.SumGWC == 0) dto.OutsaideGWPay = 0;
+            if (dto.SumGWC == 0) dto.OutsideGWPay = 0;
             if (dto.SumTDC == 0) dto.OutsideTDPay = 0;
 
             var enterExitCost = _mapper.Map<Grp_EnterExitCost>(dto);

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

@@ -302,7 +302,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
                     if (eec.SumGWC == 1)
                     {
-                        AirGWCTotal += Math.Round((eec.OutsaideGWPay), 2);
+                        AirGWCTotal += Math.Round((eec.OutsideGWPay), 2);
                     }
 
                     //住宿费合计选择框