修复生成确认书文件名不对的问题.
This commit is contained in:
@@ -49,7 +49,7 @@ namespace YLErp.Plugins.ShanXi.DocumentGenerator
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
templatePath = MosPathHelper.Combine(GlobalConfig.PluginFolder, "App_Docs\\交易确认书\\浙商证券利率债收益互换合约交易确认书模版.docx");
|
||||
templatePath = MosPathHelper.Combine(GlobalConfig.PluginFolder, "App_Docs\\交易确认书\\证券利率债收益互换合约交易确认书模版.docx");
|
||||
//}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<None Update="App_Docs\交易确认书\收益互换交易确认书(DMA)模板.docx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="App_Docs\交易确认书\浙商证券利率债收益互换合约交易确认书模版.docx">
|
||||
<None Update="App_Docs\交易确认书\证券利率债收益互换合约交易确认书模版.docx">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="App_Docs\交易确认书\证券利率债收益互换合约交易确认书模版.docx">
|
||||
|
||||
+1
-1
@@ -208,7 +208,7 @@ namespace YLErp.Modules.ReportModule.SettlementReportModule
|
||||
Directory.CreateDirectory(targetPath);
|
||||
}
|
||||
var clientName = report.client.Name;
|
||||
var fileName = report.ReportFrom == DateTime.MinValue ? $"浙商证券_估值表_{report.ReportEnd:yyyyMMdd}_{clientName}" : $"浙商证券_估值表_{report.ReportFrom:yyyyMMdd}_{report.ReportEnd:yyyyMMdd}_{clientName}";
|
||||
var fileName = report.ReportFrom == DateTime.MinValue ? $"证券_估值表_{report.ReportEnd:yyyyMMdd}_{clientName}" : $"证券_估值表_{report.ReportFrom:yyyyMMdd}_{report.ReportEnd:yyyyMMdd}_{clientName}";
|
||||
var targetFileName = Path.Combine(targetPath, $"{fileName}.xlsx");
|
||||
|
||||
var excelDeclareModel = new ExcelDeclareModel()
|
||||
|
||||
Reference in New Issue
Block a user