From a4b9c896dd6684ef18b94d0e0c44fdf79a3468a6 Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Fri, 21 Feb 2025 21:27:34 +0700 Subject: [PATCH] Bug Fixed --- Controllers/Budget.Controller.cs | 6 ++++-- Models/budget/manage_plan_budget.cs | 3 ++- obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs | 2 +- obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache | 2 +- obj/rider.project.model.nuget.info | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 7d178a8..438d87c 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -5515,7 +5515,9 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 1), ws.Cell(row, 17)).Style.Border.RightBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 3), ws.Cell(row, 17)).Style.NumberFormat.Format = "#,##0"; row++; - foreach (var sub in budgetSpendingPlan.SubBudgetSpending ?? + + } + foreach (var sub in outputProject.SubBudgetSpending ?? new List()) { ws.Cell(row, 1).Value = sub.sub_budget_spending_plan_name; @@ -5553,7 +5555,7 @@ namespace rmutr_report.Controllers row++; } } - } + } using (var stream = new MemoryStream()) diff --git a/Models/budget/manage_plan_budget.cs b/Models/budget/manage_plan_budget.cs index 7ff96e9..d198b6d 100644 --- a/Models/budget/manage_plan_budget.cs +++ b/Models/budget/manage_plan_budget.cs @@ -74,6 +74,7 @@ public class manage_plan_budget public List IndicatorPlans { get; set; } //1.แผนการปฎิบัติงาน 1.1 ตัวชี้วัด public List BudgetActivities { get; set; } //1.2. กิจกรรมหลัก public List BudgetSpendingPlans { get; set; } //2.แผนการใช้จ่ายงบประมาณ + public List SubBudgetSpending { get; set; } //2.1 งบประมาณ } public class strategy_detail { @@ -296,7 +297,7 @@ public class manage_plan_budget public decimal? quarter_4_1 { get; set; } public decimal? quarter_4_2 { get; set; } public decimal? quarter_4_3 { get; set; } - public List SubBudgetSpending { get; set; } + // public List SubBudgetSpending { get; set; } } diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index b980e45..f44df68 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+731803e190ea53557a64d88396c00747647072c2")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5d2d463a8ce5898821415482bbd0e52efd504344")] [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 d397546..7596198 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -bd75c1302a8f97c93b2b9e2834d328fc2a22862a414e94dadde3a2c3fd6624b6 +a3d102bd41f7157f07d41272a9f801855f365f6a77ca15d0502e54951a5e7df7 diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index e3cd1f2..90ece7c 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17401183874467534 \ No newline at end of file +17401239669095019 \ No newline at end of file