+1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4613,11 +4613,11 @@ namespace OASystem.API.Controllers
                         //公务舱
                         if (_EnterExitCosts.SumGWC == 1)
                         {
-                            airTotalStr += $" {_EnterExitCosts.OutsaideGWPay.ToString("#0.00")} 元/人（公务舱）";
+                            airTotalStr += $" {_EnterExitCosts.OutsideGWPay.ToString("#0.00")} 元/人（公务舱）";
                             airPriceStr += $" {_EnterExitCosts.AirGW.ToString("#0.00")} 元/人（公务舱）";
                         }
                         //头等舱
-                        if (_EnterExitCosts.SumTD == 1)
+                        if (_EnterExitCosts.SumTDC == 1)
                         {
                             airTotalStr += $" {_EnterExitCosts.OutsideTDPay.ToString("#0.00")} 元/人（头等舱）";
                             airPriceStr += $" {_EnterExitCosts.AirTD.ToString("#0.00")} 元/人（头等舱）";
@@ -4628,7 +4628,6 @@ namespace OASystem.API.Controllers
                         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,
@@ -4844,9 +4843,9 @@ namespace OASystem.API.Controllers
                         //经济舱
                         if (_EnterExitCosts.SumJJC == 1) subJJC = otherFeeTotal + _EnterExitCosts.OutsideJJPay;
                         //公务舱
-                        if (_EnterExitCosts.SumGWC == 1) subGWC = otherFeeTotal + _EnterExitCosts.OutsaideGWPay;
+                        if (_EnterExitCosts.SumGWC == 1) subGWC = otherFeeTotal + _EnterExitCosts.OutsideGWPay;
                         //头等舱
-                        if (_EnterExitCosts.SumTD == 1) subTDC = otherFeeTotal + _EnterExitCosts.OutsideTDPay;
+                        if (_EnterExitCosts.SumTDC == 1) subTDC = otherFeeTotal + _EnterExitCosts.OutsideTDPay;
 
                         dic.Add("SubJJC", subJJC.ToString("#0.00"));
                         dic.Add("SubGWC", subGWC.ToString("#0.00"));
@@ -5063,7 +5062,7 @@ namespace OASystem.API.Controllers
                         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)
@@ -5270,10 +5269,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")} 元";
@@ -5286,7 +5285,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;

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

@@ -112,7 +112,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         ///  公务舱小计选择框
         /// </summary>
-        public int SumTD { get; set; }
+        public int SumTDC { get; set; }
 
 
         #region 国际旅费子项
@@ -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);
                     }
 
                     //住宿费合计选择框