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 cfa56ef3..b15735e1 100644 Binary files a/YLErpWeb/App_Docs/导出模板/月报基础数据债券收益互换.xlsx and b/YLErpWeb/App_Docs/导出模板/月报基础数据债券收益互换.xlsx differ 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" },