费用审核

费用列表 此次付款金额 处理

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1164,11 +1164,22 @@ namespace OASystem.API.Controllers
                     if (strs.Count > 0)
                     {
                         decimal amountPayable = strs.Sum(it => it.AmountPayable);
-                        decimal thisPayment = strs.Sum(it => it.ThisPayment);
+                        
                         decimal balancePayment = strs.Sum(it => it.BalancePayment);
                         decimal auditedFunds = strs.Sum(it => it.AuditedFunds);
                         amountPayableStr += string.Format(@"{0}{1} |", amountPayable.ToString("#0.00"), item.CurrencyName);
-                        thisPaymentStr += string.Format(@"{0}{1} |", thisPayment.ToString("#0.00"), item.CurrencyName);
+
+                        //单独处理此次付款金额
+                        if (item.CurrencyId == 836) //人名币
+                        {
+                            decimal thisPayment = ccpCurrencyPrices.Sum(it => it.ThisPayment);
+                            thisPaymentStr += string.Format(@"{0}{1} |", thisPayment.ToString("#0.00"), item.CurrencyName);
+                        }
+                        else
+                        {
+                            thisPaymentStr += string.Format(@"{0}{1} |","0.00", item.CurrencyName);
+                        }
+
                         balancePaymentStr += string.Format(@"{0}{1} |", balancePayment.ToString("#0.00"), item.CurrencyName);
                         auditedFundsStr += string.Format(@"{0}{1} |", auditedFunds.ToString("#0.00"), item.CurrencyName);
                     }

OASystem/OASystem.Domain/ViewModels/Groups/Grp_CreditCardPaymentView.cs

@@ -188,6 +188,7 @@ namespace OASystem.Domain.ViewModels.Groups
 
         /// <summary>
         /// 此次付款
+        /// 基本为CNY
         /// </summary>
         public decimal ThisPayment { get; set; }