diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 7680a03..794464e 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -9,6 +9,7 @@ using FastReport.Export.Csv; using FastReport.Export.Mht; using FastReport.Export.OoXML; using FastReport.Export.Pdf; +using FastReport.Table; using Microsoft.AspNetCore.Mvc; using rmutr_report.Models; using rmutr_report.Models.Personnel; @@ -2877,33 +2878,35 @@ namespace rmutr_report.Controllers var budgetExpenditure = new List() { budget }; Report report = new Report(); - - report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx"); - report.RegisterData(budgetExpenditure, "budget_expenditure_report_from_revenue_v2"); - report.Prepare(); - + MemoryStream stream = new MemoryStream(); - switch (type) + + if (type=="pdf") { - case "pdf": - PDFExport pdf = new PDFExport(); - report.Export(pdf, stream); - stream.Seek(0, SeekOrigin.Begin); - return File(stream, "application/pdf"); - - case "xls": - case "xlsx": - Excel2007Export excel = new Excel2007Export(); - report.Export(excel, stream); - stream.Seek(0, SeekOrigin.Begin); - //return File(stream, "application/vnd.ms-excel"); - string date = DateTime.Now.ToString("yyyyMMddHHmmss"); - return File( - stream, - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", - "budgetExpenditureV2_" + date + ".xlsx"); + report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx"); + report.RegisterData(budgetExpenditure, "budget_expenditure_report_from_revenue_v2"); + report.Prepare(); + PDFExport pdf = new PDFExport(); + report.Export(pdf, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/pdf"); } + if (type=="xls"||type=="xlsx") + { + report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_excel2.frx"); + report.RegisterData(budgetExpenditure, "budget_expenditure_report_from_revenue_v2"); + report.Prepare(); + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + string date = DateTime.Now.ToString("yyyyMMddHHmmss"); + return File( + stream, + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + "budgetExpenditureV2_" + date + ".xlsx"); + } + return Ok(); } diff --git a/bin/Debug/netcoreapp3.1/font2021.3.0.list b/bin/Debug/netcoreapp3.1/font2021.3.0.list index 5dce5f5..779220a 100644 --- a/bin/Debug/netcoreapp3.1/font2021.3.0.list +++ b/bin/Debug/netcoreapp3.1/font2021.3.0.list @@ -495,3 +495,4 @@ Yu Gothic UI Semilight C:\WINDOWS\Fonts\YuGothR.ttc Microsoft Uighur-B C:\WINDOWS\Fonts\MSUIGHUB.TTF Microsoft Uighur C:\WINDOWS\Fonts\MSUIGHUR.TTF JS Wansika C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\JS-Wansika-Italic.ttf +SimSun-ExtG C:\WINDOWS\Fonts\SimsunExtG.ttf diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 027d291..714e04c 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 9e828d8..c12a4db 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index b3c81fd..ecd8b91 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5587ae4b01139e348564012f7becd7533fa9cb04")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ca8e2cd5296c02fd741e685680952221fc102ef8")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache index b5af169..b25aa80 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -bfc4cd8a73e537aeea97fd23db19ceedb7442d9f6462456ff791607e84d2b6cc +26ccf86dd2309d691421f4882a4ddf3cf76361cfee1b17fa9e0baddd28d07262 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index 4875667..ecd8b91 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70b81462edf0f1face8abf64fe34bf854466b604")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ca8e2cd5296c02fd741e685680952221fc102ef8")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache index afd710b..b25aa80 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -7546727fffba564112d223a078c58ac3ecebea3c99144f1f13fb85d319daff04 +26ccf86dd2309d691421f4882a4ddf3cf76361cfee1b17fa9e0baddd28d07262 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index e0cc47e..6549a4d 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -45d788564aa6110c160db03ebf1823c941a4b4b0d1f6843c93d7db16ee4a9de8 +6af9db90da3c0573e9e42df4e8ac89a3cab676a807efa559c3d02814cd3045b6 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 027d291..714e04c 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 9e828d8..c12a4db 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props index 37e2862..83b642d 100644 --- a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +++ b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props @@ -112,6 +112,54 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\budget_expenditure_report_from_revenue_excel.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_excel.frx)) + + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\budget_expenditure_report_from_revenue_excel1.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_excel1.frx)) + + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\budget_expenditure_report_from_revenue_excel2.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_excel2.frx)) + Package rmutr_report diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index a3269f2..b6b428d 100644 --- a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -b77baecdf45cb80236438e8a223568cbd6e07fc272289f2130dc9e2d455d9160 +feb24e70c21b9d83dc31845e6343ebf94a5549a3846e2fb29ef9fc07034acaa5 diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 71cb858..dd93377 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17271548316688011 \ No newline at end of file +17280226596462567 \ No newline at end of file diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue_excel2.frx b/wwwroot/reports/budget_expenditure_report_from_revenue_excel2.frx new file mode 100644 index 0000000..3b468b5 --- /dev/null +++ b/wwwroot/reports/budget_expenditure_report_from_revenue_excel2.frx @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +