From 342587368c3f060d6c9f3ec6fe3cff377dc0a81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Tue, 22 Apr 2025 19:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E4=BC=B0=E5=80=BC=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SwapModule/SwapFlowEventService.cs | 4 +-- YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx | Bin 19451 -> 17988 bytes .../TradeMarketReport_EodPosition.js | 24 ------------------ 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs b/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs index 276dc303..eadb5019 100644 --- a/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs @@ -455,8 +455,8 @@ namespace YLErp.Modules.SwapModule /// private SearchListResult GetSearchPositionEventList(ClientSwapPositionRequest req) { - List eventTyps = new List() { (int)SwapEventTypeEnum.平仓, (int)SwapEventTypeEnum.互换, (int)SwapEventTypeEnum.自动互换 }; - var predicate = PredicateBuilder.Create(n => n.DataState == (int)SwapFlowDateStateEnum.完成 && eventTyps.Contains(n.EventType)); + // List eventTyps = new List() { (int)SwapEventTypeEnum.平仓, (int)SwapEventTypeEnum.互换, (int)SwapEventTypeEnum.自动互换 }; + var predicate = PredicateBuilder.Create(n => n.DataState == (int)SwapFlowDateStateEnum.完成 ); var tradePredicate = PredicateBuilder.Create(n => n.TradeType == "收益互换" && n.ValidState != "InValid"); if (req.ClientId > 0) diff --git a/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx b/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx index 43f1b2e86835fcc2c1fa633b46b4bfc997eba661..7e66c1510932399177798ee02d3af518d2223661 100644 GIT binary patch delta 11301 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 delta 12753 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 diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js index d14c0681..87557703 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js @@ -248,30 +248,6 @@ var colModelGrid = [ width: 90, align: 'center', sortable: false, - }, { - name: 'OpenMarginAmount', - label: '期初预付金', - index: 'OpenMarginAmount', - width: 120, - align: 'center', - formatter: StockEqvNotionalFormat, - sortable: false, - }, { - name: 'OpenMarginRate', - label: '期初预付金利率', - index: 'OpenMarginRate', - width: 120, - align: 'center', - sortable: false, - formatter: RateFormat - }, { - name: 'MarginInterestAmount', - label: '预付金利息', - index: 'MarginInterestAmount', - width: 120, - align: 'center', - formatter: StockEqvNotionalFormat, - sortable: false, }, { name: 'FloatRateAbs', label: '浮动利率(绝对)',