diff --git a/Controllers/SummaryInvest.Controller.cs b/Controllers/SummaryInvest.Controller.cs index e0a1059..a8a156b 100644 --- a/Controllers/SummaryInvest.Controller.cs +++ b/Controllers/SummaryInvest.Controller.cs @@ -47,13 +47,17 @@ namespace rmutr_report.Controllers { 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; + } } } } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 56ce1dc..0e7de94 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 762d99e..7e0589e 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 6ef777b..58a0053 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+d3ca59bb6898d7aaa0d4ed57404d662f17ad737d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad0b43ca48bec5b06b9d28038409fb43c50ccec5")] [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 47e9d0d..8354a4a 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -578315dfe7acff9d1520dc6815c4da6525e5f7c5be5bd108ef249e8702bd9738 +dc5eabf09b58379b53feb30709b996c5032760611cba7922a37905f04ffadfb5 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index 6ef777b..58a0053 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+d3ca59bb6898d7aaa0d4ed57404d662f17ad737d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad0b43ca48bec5b06b9d28038409fb43c50ccec5")] [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 47e9d0d..8354a4a 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -578315dfe7acff9d1520dc6815c4da6525e5f7c5be5bd108ef249e8702bd9738 +dc5eabf09b58379b53feb30709b996c5032760611cba7922a37905f04ffadfb5 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index e864727..2eba7e5 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -a84ad6cbd8971193dca07004150b8d3755a741cd25dfeef71b03c7aee56b117c +68de01a6bd7215a94454eb302693f9228d732e4e8151a0ca1a8cd5a493df713b diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 56ce1dc..0e7de94 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 762d99e..7e0589e 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 b644f25..5974ec4 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17266438397777143 \ No newline at end of file +17266565040277969 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 5974ec4..e89f14c 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17266565040277969 \ No newline at end of file +17267261645160802 \ No newline at end of file