PostEnterExitCostOperate

更改  InsidePay

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3688,8 +3688,10 @@ namespace OASystem.API.Controllers
                                                       .ToList();
                 var blackCode = _sqlSugar.Queryable<Air_TicketBlackCode>().Where(it => it.IsDel == 0 && it.DiId == dto.DiId).First();
                 var threeCodes = _sqlSugar.Queryable<Res_ThreeCode>().Where(it => it.IsDel == 0).ToList();
+                var placeData = _sqlSugar.Queryable<Grp_NationalTravelFee>().Where(it => it.IsDel == 0).ToList();
                 var rateDatas = await _EnterExitCosts.CurrencyRemark.SplitExchangeRate();
 
+
                 if (dto.ExportType == 1) //明细表
                 {
                     if (dto.SubTypeId == 1005) //1005(默认明细表)
@@ -3707,7 +3709,7 @@ namespace OASystem.API.Controllers
 
                         decimal stayFeeTotal = _DayAndCosts.Where(it => it.Type == 1).Sum(it => it.SubTotal);  // 住宿费
                         decimal mealsFeeTotal = _DayAndCosts.Where(it => it.Type == 2).Sum(it => it.SubTotal);  // 伙食费费
-                        decimal miscellaneousFeeTotal = _DayAndCosts.Where(it => it.Type == 1).Sum(it => it.SubTotal);  // 公杂费
+                        decimal miscellaneousFeeTotal = _DayAndCosts.Where(it => it.Type == 3).Sum(it => it.SubTotal);  // 公杂费
                         decimal tainFeeTotal = _DayAndCosts.Where(it => it.Type == 4).Sum(it => it.SubTotal);  // 培训费
                         dic.Add("InsidePay", _EnterExitCosts.InsidePay.ToString("#0.00"));
 
@@ -3758,7 +3760,9 @@ namespace OASystem.API.Controllers
                         dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
                         dic.Add("SubZS", stayFeeTotal.ToString("#0.00"));
                         dic.Add("SubHS", mealsFeeTotal.ToString("#0.00"));
-                        dic.Add("SubGZF", miscellaneousFeeTotal.ToString("F2"));
+
+                        string miscellaneousFeeTotalStr = miscellaneousFeeTotal.ToString("#0.00");
+                        dic.Add("SubGZF", miscellaneousFeeTotalStr);
                         dic.Add("SubPX", tainFeeTotal.ToString("#0.00"));
 
                         decimal subJJC = _EnterExitCosts.InsidePay + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsideJJPay;
@@ -3790,6 +3794,7 @@ namespace OASystem.API.Controllers
                             builder.Write("第" + dac.Days.ToString() + "晚：");
 
                             builder.MoveToCell(0, i, 1, 0);
+                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");
                             builder.Write(dac.Place == null ? "" : dac.Place);
 
                             builder.MoveToCell(0, i, 2, 0);
@@ -3828,7 +3833,7 @@ namespace OASystem.API.Controllers
                             builder.Write("第" + dac.Days.ToString() + "天：");
 
                             builder.MoveToCell(1, i, 1, 0);
-                            builder.Write(dac.Place == null ? "" : dac.Place);
+                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");
 
                             builder.MoveToCell(1, i, 2, 0);
                             builder.Write("费用标准：");
@@ -3867,7 +3872,7 @@ namespace OASystem.API.Controllers
                             builder.Write("第" + dac.Days.ToString() + "天：");
 
                             builder.MoveToCell(2, i, 1, 0);
-                            builder.Write(dac.Place == null ? "" : dac.Place);
+                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");
 
                             builder.MoveToCell(2, i, 2, 0);
                             builder.Write("费用标准：");

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

@@ -123,6 +123,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             Result result = new Result() { Code =-1,Msg="操作失败!" };
 
             var enterExitCost = _mapper.Map<Grp_EnterExitCost>(dto);
+            enterExitCost.InsidePay = enterExitCost.Visa + enterExitCost.YiMiao + enterExitCost.HeSuan + enterExitCost.Service + enterExitCost.Safe + enterExitCost.Ticket;
             var quarterageData = _mapper.Map<List<Grp_DayAndCost>>(dto.QuarterageData);  //住宿费 1
             quarterageData = quarterageData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();