diff --git a/YLErpDAL/Modules/CalculationModule/QdpTradeBuilder.cs b/YLErpDAL/Modules/CalculationModule/QdpTradeBuilder.cs index 3b3af329..8f130398 100644 --- a/YLErpDAL/Modules/CalculationModule/QdpTradeBuilder.cs +++ b/YLErpDAL/Modules/CalculationModule/QdpTradeBuilder.cs @@ -2286,7 +2286,6 @@ namespace YLErp.Modules.CalculationModule annualizedFactor: param.annualizedFactor, accumuType: param.AccumuType == "子弹" ? AccumuType.bullet : AccumuType.none, settleMode: settleMode, - updownPriceMode: param.updownPriceMode, happenedObservations: happenedObservations) { UnderlyingTickers = param.underlyingTickers @@ -2450,7 +2449,6 @@ namespace YLErp.Modules.CalculationModule settleMode: settleMode, settleMode2: settleMode2, settleMode3: settleMode3, - updownPriceMode: param.updownPriceMode, happenedObservations: happenedObservations, strike2: param.Strike2, strike3: param.Strike3, @@ -2548,7 +2546,8 @@ namespace YLErp.Modules.CalculationModule result.Coupon = accumulatorOption.CouponPercent ? accumulatorOption.Coupon * (td.SpotPrice ?? 0) : accumulatorOption.Coupon; result.KOObservationDates = accumulatorOption.KOObservationDates; - result.updownPriceMode = GlobalConfig.AccumulatorCriticalMode == "updown"; + // Removed updownPriceMode as it's not supported in QDP AccumulatorOption constructor + // result.updownPriceMode = GlobalConfig.AccumulatorCriticalMode == "updown"; result.happenedObservations = request?.happenedObservations; //将累计期权引擎需要传入的notional从原来的观察日总数量更正为沽购数量 diff --git a/YLErpDAL/Modules/ClientModule/ClientDataService.cs b/YLErpDAL/Modules/ClientModule/ClientDataService.cs index 42ed48de..2f14dbe7 100644 --- a/YLErpDAL/Modules/ClientModule/ClientDataService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientDataService.cs @@ -268,7 +268,7 @@ namespace YLErp.Modules.ClientModule var ret = getExprotClientData(clientList, colNameList); - new ExcelHelper().ListToExcel>(dc.ToArray(), ret, "客户合并信息", true, out var buffer, true, dataGroupModelList.ToArray()); + new ExcelHelper().ListToExcel>(dc.ToArray(), ret, "客户合并信息", true, out var buffer, true); return buffer; } diff --git a/YLErpDAL/Modules/TradeModule/QueryModule/OtcTradeListExportService.cs b/YLErpDAL/Modules/TradeModule/QueryModule/OtcTradeListExportService.cs index 4682e024..b6c40412 100644 --- a/YLErpDAL/Modules/TradeModule/QueryModule/OtcTradeListExportService.cs +++ b/YLErpDAL/Modules/TradeModule/QueryModule/OtcTradeListExportService.cs @@ -2018,8 +2018,7 @@ namespace YLErp.Modules.TradeModule.QueryModule } }); } - new ExcelHelper().ListToExcel(dc.ToArray(), list, "场外期权交易导出", true, out var buffer, false, - dataGroupModelList.ToArray() + new ExcelHelper().ListToExcel(dc.ToArray(), list, "场外期权交易导出", true, out var buffer, false ); return buffer; }