From 535eac0f62887163047cc01005044baea1df9d01 Mon Sep 17 00:00:00 2001 From: tengyufan <1532636164@qq.com> Date: Thu, 2 Jul 2026 10:31:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=A4=E6=98=93=E6=97=A5=E5=8E=86IB?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=94=B6=E7=AA=84=E2=80=94=E2=80=94=E4=BB=85?= =?UTF-8?q?=E6=88=90=E4=BA=A4=E6=97=A5=E6=9C=9F=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=93=B6=E8=A1=8C=E9=97=B4=E6=97=A5=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 回退 ylotc.calendar.js 至纯CHN，恢复全部日期选择器为证券交易所交易日历 - SwapTrade2Controller 新增 GetBestCountry 按年份判断IB数据是否存在 - 仅成交日期(TradeDate)默认值使用IB优先/CHN回退，开始日期和到期日期保持CHN - 平仓及其他交易页面日期选择器不再受银行间日历影响 --- YLErpWeb/Controllers/SwapTrade2Controller.cs | 2 +- YLErpWeb/wwwroot/Scripts/base/ylotc.calendar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/YLErpWeb/Controllers/SwapTrade2Controller.cs b/YLErpWeb/Controllers/SwapTrade2Controller.cs index 3eceef63..d882d4ec 100644 --- a/YLErpWeb/Controllers/SwapTrade2Controller.cs +++ b/YLErpWeb/Controllers/SwapTrade2Controller.cs @@ -67,7 +67,7 @@ namespace YLErp.Web.Controllers { TradeType = "收益互换", UnderlyingInstrumentType = "Stock", - StartDate = QdpCalendarHelper.GetNonHoliday(valuedateBLL.ValueDate, tradeDateCountry), + StartDate = QdpCalendarHelper.GetNonHoliday(valuedateBLL.ValueDate), TradeDate = QdpCalendarHelper.GetNonHolidayDefore(valuedateBLL.ValueDate.AddDays(-1), tradeDateCountry), TraderId = CurUser.UserId, TraderName = CurUser.UserName, diff --git a/YLErpWeb/wwwroot/Scripts/base/ylotc.calendar.js b/YLErpWeb/wwwroot/Scripts/base/ylotc.calendar.js index a726787b..53a68fdf 100644 --- a/YLErpWeb/wwwroot/Scripts/base/ylotc.calendar.js +++ b/YLErpWeb/wwwroot/Scripts/base/ylotc.calendar.js @@ -13,7 +13,7 @@ ylotc.isHoliday = function (date) { return false; } var y = date.getFullYear().toString(); - var holidays = ylotc.calendar[y + "ib"] || ylotc.calendar[y]; + var holidays = ylotc.calendar[y]; if (Array.isArray(holidays)) { var d = date.getDate(); var m = date.getMonth() + 1;//js月份从0开始