Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TRS-ZS-464 估值单调整& 利息计算修复&审批修复

Browse Source
This commit is contained in:
吴方海
2025-05-28 18:09:19 +08:00
parent eb5990b9a3
commit 083848fb62
14 changed files with 198 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportFotShanXiService.cs
+22 -2
View File
@@ -233,7 +233,17 @@ namespace YLErp.Modules.ReportModule.SettlementReportModule
}
if (report.EodSwapPositions != null)
{
modelDict.Add("互换估值", report.EodSwapPositions);
modelDict.Add("互换估值", new
{
EodSwapPositions = report.EodSwapPositions,
PosiNotionalValueSum= report.EodSwapPositions.Sum(x => x.position.PosiNotionalValue),
PosiQuantitySum= report.EodSwapPositions.Sum(x => x.position.PosiQuantity),
PeriodAmountSum= report.EodSwapPositions.Sum(x => x.PeriodAmount),
InterestAmountSum= report.EodSwapPositions.Sum(x => x.InterestAmount),
VTradingFeeSum= report.EodSwapPositions.Sum(x => x.position.VTradingFee),
PosiProfitSum= report.EodSwapPositions.Sum(x => x.position.PosiProfitSum),
NetSettmentAmountSum= report.EodSwapPositions.Sum(x => x.NetSettmentAmount),
});
}
if (report.SwapPositions != null)
{
@@ -241,7 +251,17 @@ namespace YLErp.Modules.ReportModule.SettlementReportModule
}
if (report.clientSwapPositions != null)
{
modelDict.Add("互换交易流水", report.clientSwapPositions);
modelDict.Add("互换交易流水", new
{
ClientSwapPositions = report.clientSwapPositions,
TradeFeeSum= report.clientSwapPositions.Sum(x => x.TradeFee),
TradingFeeSum= report.clientSwapPositions.Sum(x => x.TradingFee),
PosiPnlSum = report.clientSwapPositions.Sum(x => x.PosiPnl),
DividendInSum= report.clientSwapPositions.Sum(x => x.FlowEvent.DividendIn),
InterestAmountSum= report.clientSwapPositions.Sum(x => x.FlowEvent.InterestAmount),
InterestFeeSum= report.clientSwapPositions.Sum(x => x.FlowEvent.InterestFee),
NetSettmentAmountSum = report.clientSwapPositions.Sum(x => x.NetSettmentAmount),
});
}
if (report.ClientCashInCashOutExtendList != null)
{