出入境费用明细

模板调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -316,7 +316,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostGroupPageList(GroupPageListDto dto)
         {
-            #region  参数验证
+             #region  参数验证
             if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
             if (dto.PageId < 1) return Ok(JsonView(false, "页面Id为空"));
 
@@ -4261,28 +4261,27 @@ namespace OASystem.API.Controllers
                         decimal allPrice = dac1totalPrice + dac2totalPrice + _EnterExitCosts.Visa + _EnterExitCosts.Safe + _EnterExitCosts.Ticket;
 
                         //国际旅费
-
                         string outsideJJ = "";
                         string allPriceJJ = "";
                         if (_EnterExitCosts.SumJJC == 1)
                         {
-                            outsideJJ = string.Format(@"经济舱:{0} 元/人", _EnterExitCosts.OutsideJJPay.ToString("#0.00"));
+                            outsideJJ = string.Format(@"经济舱:{0} 元/人", _EnterExitCosts.SumJJC.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"));
+                            outsideGW = string.Format(@"公务舱:{0} 元/人", _EnterExitCosts.AirGW.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);
+                            string InTravelPriceStr = string.Format(@" ({0} {1})", outsideJJ, outsideGW);
                             dic.Add("InTravelPrice", InTravelPriceStr);
 
-                            string FinalSumPriceStr = string.Format(@" ({0}    {1})", allPriceJJ, allPriceGW);
+                            string FinalSumPriceStr = string.Format(@" ({0} {1})", allPriceJJ, allPriceGW);
                             dic.Add("FinalSumPrice", FinalSumPriceStr);
                         }
 

OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -408,7 +408,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// <param name="dto"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<Result> _Del(int id, int userId)
+        public async Task<Result>  (int id, int userId)
         {
             Result result = new Result() { Code = -2, Msg = "删除失败！" };
 

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

@@ -352,6 +352,25 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return result;
         }
 
+        public async Task<Result> _Del(int id, int diid)
+        {
+            Result result = new Result() { Code = -1 , Msg = "操作成功!" };
+
+            if (id < 1) return result = new Result() { Code = -1, Msg = "请传入有效的Id参数!" };
+
+            if (diid < 1) return result = new Result() { Code = -1, Msg = "请传入有效的Id参数!" };
+
+            BeginTran();
+
+
+            CommitTran();
+
+            RollbackTran();
+            result.Msg = "操作失败";
+            return result;
+        }
+
+
         /// <summary>
         /// 团组模块 - 出入境国家费用标准 - Add Or Update
         /// </summary>