三公费用导入收款账单数据 --> 增加其他款项金额

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -887,12 +887,9 @@ namespace OASystem.API.OAMethodLib
         {
             var data = new List<Fin_ForeignReceivables>();
 
-            var enterExitCosts = await _sqlSugar.Queryable<Grp_EnterExitCost>()
-                                                .Where(it => it.IsDel == 0 && it.DiId == groupId)
-                                                .FirstAsync();
-            var dayAndCosts = await _sqlSugar.Queryable<Grp_DayAndCost>()
-                                             .Where(it => it.IsDel == 0 && it.DiId == groupId)
-                                             .ToListAsync();
+            var enterExitCosts = await _sqlSugar.Queryable<Grp_EnterExitCost>().Where(it => it.IsDel == 0 && it.DiId == groupId).FirstAsync();
+            var dayAndCosts = await _sqlSugar.Queryable<Grp_DayAndCost>().Where(it => it.IsDel == 0 && it.DiId == groupId).ToListAsync();
+            var dayOtherCosts = await _sqlSugar.Queryable<Grp_DayOtherPrice>().Where(x => x.IsDel == 0 && x.Diid == groupId).ToListAsync(); //其他款项
             if (enterExitCosts == null) return data;
 
             //数据源
@@ -930,7 +927,8 @@ namespace OASystem.API.OAMethodLib
                     stayFeeTotal = 0.00M,            //住宿费
                     mealsFeeTotal = 0.00M,           //餐食费
                     miscellaneousFeeTotal = 0.00M,   //公杂费
-                    trainFeeTotal = 0.00M;           //培训费
+                    trainFeeTotal = 0.00M,           //培训费
+                    otherPriceTotal = 0.00M;         //其他款项
 
             //境内费用(其他费用)
             if (enterExitCosts.ChoiceOne == 1) domesticFeeTotal = enterExitCosts.InsidePay;
@@ -947,7 +945,11 @@ namespace OASystem.API.OAMethodLib
             //培训费
             if (enterExitCosts.ChoiceSix == 1) trainFeeTotal = trainData.Sum(x => x.SubTotal);
 
-            decimal otherFeeTotal = domesticFeeTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + trainFeeTotal;
+            //其他款项
+            if (enterExitCosts.OtherExpenses_Checked == 1) otherPriceTotal = dayOtherCosts.Sum(x => x.SubTotal);
+
+            decimal otherFeeTotal = domesticFeeTotal + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + trainFeeTotal + otherPriceTotal;
+
             //国际旅费合计
             //经济舱
             if (enterExitCosts.SumJJC == 1) economyClassFeeTotal = enterExitCosts.OutsideJJPay + otherFeeTotal;
@@ -998,7 +1000,6 @@ namespace OASystem.API.OAMethodLib
                 }
             }
 
-
             return data;
         }
 

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

@@ -244,7 +244,6 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int IsConfirm { get; set; } = 1;
 
-
         /// <summary>
         /// 其他费用选择框
         /// </summary>