diff --git a/Controllers/SummaryInvest.Controller.cs b/Controllers/SummaryInvest.Controller.cs index a8a156b..11c8310 100644 --- a/Controllers/SummaryInvest.Controller.cs +++ b/Controllers/SummaryInvest.Controller.cs @@ -27,43 +27,69 @@ namespace rmutr_report.Controllers public IActionResult GetEBudgetingReport([FromRoute] string type, [FromBody] summary_invest summaryInvest) { var summaryInvests = new List() { summaryInvest }; - foreach (var summaryInvestYear in summaryInvest.years) + if (summaryInvest.total_budget != summaryInvest.unit_price) +{ + summaryInvest.total_budget = summaryInvest.unit_price; +} +foreach (var summaryInvestYear in summaryInvest.years) +{ + if (summaryInvestYear.total_budget != summaryInvestYear.unit_price) + { + summaryInvestYear.total_budget = summaryInvestYear.unit_price; + } + foreach (var plan in summaryInvestYear.plans) + { + if (plan.total_budget != plan.unit_price) + { + plan.total_budget = plan.unit_price; + } + foreach (var project in plan.projects) + { + if (project.total_budget != project.unit_price) { - foreach (var plan in summaryInvestYear.plans) + project.total_budget = project.unit_price; + } + foreach (var faculty in project.facultys) + { + if (faculty.total_budget != faculty.unit_price) { - if (plan.total_budget<=10) + faculty.total_budget = faculty.unit_price; + } + + foreach (var assetList in faculty.asset_lists) + { + if (assetList.total != assetList.unit_price) { - plan.total_budget = plan.unit_price; + assetList.total = assetList.unit_price; } - foreach (var project in plan.projects) + if (assetList.total == null && assetList.amount == 1) { - if (project.total_budget<=10) - { - project.total_budget = project.unit_price; - } - foreach (var faculty in project.facultys) - { - if (faculty.total_budget<=10) - { - faculty.total_budget = faculty.unit_price; - } - - foreach (var assetList in faculty.asset_lists) - { - if (assetList.total<=10) - { - assetList.total = assetList.unit_price; - } - if (assetList.total==null&&assetList.amount==1) - { - assetList.total = assetList.unit_price; - } - } - } + assetList.total = assetList.unit_price; + } + if (assetList.amount > 1) + { + assetList.total = assetList.unit_price * assetList.amount; } } + // foreach (var constructList in faculty.construct_lists) + // { + // if (constructList.total != constructList.unit_price) + // { + // constructList.total = constructList.unit_price; + // } + // if (constructList.total == null && constructList.amount == 1) + // { + // constructList.total = constructList.unit_price; + // } + // if (constructList.amount > 1) + // { + // constructList.total = constructList.unit_price * constructList.amount; + // } + // } } - + } + } +} Report report = new Report(); report.Load(_setting.report_path + "summary_invest.frx"); report.RegisterData(summaryInvests, "summary_invest"); @@ -101,10 +127,22 @@ namespace rmutr_report.Controllers var summaryInvests = new List() { summaryInvest }; if (summaryInvest != null) { + if (summaryInvest.total_budget != summaryInvest.unit_price) + { + summaryInvest.total_budget = summaryInvest.unit_price; + } foreach (var summaryInvestYear in summaryInvest.years) { + if (summaryInvestYear.total_budget != summaryInvestYear.unit_price) + { + summaryInvestYear.total_budget = summaryInvestYear.unit_price; + } foreach (var plan in summaryInvestYear.plans) { + if (plan.total_budget != plan.unit_price) + { + plan.total_budget = plan.unit_price; + } foreach (var assetList in plan.asset_lists) { string formattedSeller = assetList.seller.Replace("
", " "); @@ -128,10 +166,19 @@ namespace rmutr_report.Controllers formattedFile = formattedFile.Trim(); assetList.file2 = formattedFile; - - //Console.WriteLine("seller output: " + formattedSeller); - //Console.WriteLine("file output: " + formattedFile); - } + if (assetList.total != assetList.unit_price) + { + assetList.total = assetList.unit_price; + } + if (assetList.total == null && assetList.amount == 1) + { + assetList.total = assetList.unit_price; + } + if (assetList.amount > 1) + { + assetList.total = assetList.unit_price * assetList.amount; + } + } } } } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 8dbaedc..c02e72f 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 9636810..19c44ea 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 0e7a98a..17bbffd 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+9a4f0e95eaab3a2fdfc849b0360aca819504bede")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5abb0843e4a76829532bd2fee4ce99d379579140")] [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 0ff9b20..1591b8f 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -e563ea69829e73d4ba56ee977869e67c6b68c3d5c86c9a065ecf6a266aae8031 +52e8db3788ecf506c07090a5147c8bca54ca3b6569071f7090aab62573832caf diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index 52f7543..17bbffd 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+91cff19bff1260866d947163111eb8dd29ad5077")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5abb0843e4a76829532bd2fee4ce99d379579140")] [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 56e93e5..1591b8f 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -0acb8f26062a50e497e3d20f8ebbaf2a2401ca261db2b8a593f3d5291aef38be +52e8db3788ecf506c07090a5147c8bca54ca3b6569071f7090aab62573832caf diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index c8dc2f0..301b76b 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -9366782ca8670ec554b748dfb699af96890da62fe84a37ad0dedfa8a188a61c7 +395ab626e2d4d33b8f8100e97921c4edb4adf4807825daf60f0b675437247c27 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 8dbaedc..c02e72f 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 9636810..19c44ea 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/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index c6af64b..ff39c6d 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17379510230109028 \ No newline at end of file +17379588852302958 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index c6af64b..77f0c95 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17379510230109028 \ No newline at end of file +17387528887442742 \ No newline at end of file diff --git a/wwwroot/reports/summary_invest_preview.frx b/wwwroot/reports/summary_invest_preview.frx index e88b50c..a2ef59b 100644 --- a/wwwroot/reports/summary_invest_preview.frx +++ b/wwwroot/reports/summary_invest_preview.frx @@ -1,5 +1,5 @@  - + @@ -160,7 +160,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -245,7 +245,7 @@ - +