From ffd547efcd9861d3ea4f6d376eaf6d3b6284bf68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Tue, 9 Sep 2025 16:00:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZheShang/SwapTradeMothReport.cs | 10 +++------- .../ZheShang/SwapTradeMothReportModel.cs | 11 +++-------- .../导出模板/月报基础数据债券收益互换.xlsx | Bin 25859 -> 25861 bytes YLErpWeb/Properties/launchSettings.json | 2 +- YLErpWeb/appsettings.local.json | 2 +- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/YLErpDAL/Modules/SuperviseReportModule/ExtendReport/ZheShang/SwapTradeMothReport.cs b/YLErpDAL/Modules/SuperviseReportModule/ExtendReport/ZheShang/SwapTradeMothReport.cs index 8fc5c475..f7415ecf 100644 --- a/YLErpDAL/Modules/SuperviseReportModule/ExtendReport/ZheShang/SwapTradeMothReport.cs +++ b/YLErpDAL/Modules/SuperviseReportModule/ExtendReport/ZheShang/SwapTradeMothReport.cs @@ -24,7 +24,7 @@ namespace YLErp.Modules.SuperviseReportModule.ExtendReport.ZheShang public override string TargetFileName => "月报基础数据债券收益互换"+ base.RequestInfo.ValueDate.ToString("yyyyMM") +".xlsx"; public override Dictionary SearchReportInfo() { - var yearMonth = RequestInfo.ValueDate.ToString("yyyyMM"); + var yearMonth = RequestInfo.ValueDate.ToString("yyyy-MM-dd"); var dealList = new List(); var addList= new List(); var reportData = GetSwapMonthReport(yearMonth); @@ -48,15 +48,11 @@ namespace YLErp.Modules.SuperviseReportModule.ExtendReport.ZheShang private SwapTradeMothReportModelList GetSwapMonthReport(string yearMonth) { var baseUrl = Environment.GetEnvironmentVariable("Reg_Report_Url"); - var calculateUrl = "/calc/cal_bond_value"; - SwapTradeMothReportModelListRequest request = new SwapTradeMothReportModelListRequest() - { - YearMonth= yearMonth - }; + var calculateUrl = "/swap-trade/month-report?date="+yearMonth; if (!string.IsNullOrEmpty(baseUrl)) { var httpHelper = new HttpHelper(baseUrl, null); - var result = httpHelper.PostRequestNoAuth(calculateUrl, request).Result; + var result = httpHelper.GetRequestNoAuth< SwapTradeMothReportModelListReponse>(calculateUrl).Result; if (result != null && !result.success) { LogFactory.GetLogger("SwapTradeMothReport").Info("获取收益互换月报信息失败：" + result.message); diff --git a/YLErpDAL/Modules/SuperviseReportModule/ExtendReport/ZheShang/SwapTradeMothReportModel.cs b/YLErpDAL/Modules/SuperviseReportModule/ExtendReport/ZheShang/SwapTradeMothReportModel.cs index 51d58bd9..5c201486 100644 --- a/YLErpDAL/Modules/SuperviseReportModule/ExtendReport/ZheShang/SwapTradeMothReportModel.cs +++ b/YLErpDAL/Modules/SuperviseReportModule/ExtendReport/ZheShang/SwapTradeMothReportModel.cs @@ -37,7 +37,7 @@ namespace YLErp.Modules.SuperviseReportModule.ExtendReport.ZheShang /// /// 名义本金/多头名义本金 (元) /// - public decimal NotionalPrincipalAmountL { get; set; } + public decimal? NotionalPrincipalAmountL { get; set; } /// /// 空头名义本金(元) (多空组合填写) @@ -107,17 +107,12 @@ namespace YLErp.Modules.SuperviseReportModule.ExtendReport.ZheShang /// /// 多头合约价值(元) /// - public decimal LongPositionContractValue { get; set; } + public decimal? LongPositionContractValue { get; set; } /// /// 空头合约价值(元) /// - public decimal ShortPositionContractValue { get; set; } - } - - public class SwapTradeMothReportModelListRequest - { - public string YearMonth { get; set; } + public decimal? ShortPositionContractValue { get; set; } } public class SwapTradeMothReportModelListReponse : ApiResponse { diff --git a/YLErpWeb/App_Docs/导出模板/月报基础数据债券收益互换.xlsx b/YLErpWeb/App_Docs/导出模板/月报基础数据债券收益互换.xlsx index cfa56ef34149eec2b2572c87f92e7df689ced74d..b15735e1c2a27afedf34b15031b328a27b2a96bb 100644 GIT binary patch delta 2948 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 delta 3001 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 diff --git a/YLErpWeb/Properties/launchSettings.json b/YLErpWeb/Properties/launchSettings.json index be61e851..6b0464ba 100644 --- a/YLErpWeb/Properties/launchSettings.json +++ b/YLErpWeb/Properties/launchSettings.json @@ -5,7 +5,7 @@ "launchBrowser": true, "launchUrl": "http://localhost:49462", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "dev" + "ASPNETCORE_ENVIRONMENT": "local" }, "applicationUrl": "http://localhost:49462" } diff --git a/YLErpWeb/appsettings.local.json b/YLErpWeb/appsettings.local.json index a6b34344..49a2868a 100644 --- a/YLErpWeb/appsettings.local.json +++ b/YLErpWeb/appsettings.local.json @@ -70,7 +70,7 @@ "BondOmsInterface": { "BaseUrl": "http://trs.yiliantech.com:8080/trs_hub_api" }, - "Reg_Report_Url": "http://139.196.109.225:8889", + "Reg_Report_Url": "http://139.196.109.225:8889",//报送后端地址 "OrcaleDatabaseConfig": { "Schema": "APEX_040000" },