Bug Fixed

2025-02-25 19:09:42 +07:00
parent a4b9c896dd
commit c5e56063e2
13 changed files with 12 additions and 11 deletions
--- a/Controllers/Budget.Controller.cs
+++ b/Controllers/Budget.Controller.cs
@@ -5516,8 +5516,8 @@ namespace rmutr_report.Controllers
                        ws.Range(ws.Cell(row, 3), ws.Cell(row, 17)).Style.NumberFormat.Format = "#,##0";
                        row++;
                        
-                    }
-                        foreach (var sub in outputProject.SubBudgetSpending ??
+                    //}
+                        foreach (var sub in budgetSpendingPlan.SubBudgetSpending ??
                                            new List<sub_budget_spending_plan>())
                        {
                            ws.Cell(row, 1).Value = sub.sub_budget_spending_plan_name;
@@ -5555,6 +5555,7 @@ namespace rmutr_report.Controllers
                            row++;
                        }
                    }
+                    }
                
            }

--- a/Models/budget/manage_plan_budget.cs
+++ b/Models/budget/manage_plan_budget.cs
@@ -74,7 +74,7 @@ public class manage_plan_budget
     public List<indicator_plan> IndicatorPlans { get; set; } //1.แผนการปฎิบัติงาน 1.1 ตัวชี้วัด
     public List<budget_activitie>  BudgetActivities { get; set; } //1.2. กิจกรรมหลัก 
     public List<budget_spending_plan>  BudgetSpendingPlans { get; set; } //2.แผนการใช้จ่ายงบประมาณ
-     public List<sub_budget_spending_plan>  SubBudgetSpending { get; set; } //2.1 งบประมาณ 
+     //public List<sub_budget_spending_plan>  SubBudgetSpending { get; set; } //2.1 งบประมาณ 
 }
 public class strategy_detail
 {
@@ -297,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<sub_budget_spending_plan>  SubBudgetSpending { get; set; }
+     public List<sub_budget_spending_plan>  SubBudgetSpending { get; set; }

 }

--- a/bin/Debug/netcoreapp3.1/rmutr_report.dll
+++ b/bin/Debug/netcoreapp3.1/rmutr_report.dll
--- a/bin/Debug/netcoreapp3.1/rmutr_report.pdb
+++ b/bin/Debug/netcoreapp3.1/rmutr_report.pdb
--- 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+5d2d463a8ce5898821415482bbd0e52efd504344")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a4b9c896dd6684ef18b94d0e0c44fdf79a3468a6")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-a3d102bd41f7157f07d41272a9f801855f365f6a77ca15d0502e54951a5e7df7
+371c200e98a2676e758da94f74c0bc6363cbbc35d65b4f08b471b97250d1118e
--- 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+731803e190ea53557a64d88396c00747647072c2")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a4b9c896dd6684ef18b94d0e0c44fdf79a3468a6")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-bd75c1302a8f97c93b2b9e2834d328fc2a22862a414e94dadde3a2c3fd6624b6
+371c200e98a2676e758da94f74c0bc6363cbbc35d65b4f08b471b97250d1118e
--- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
@@ -1 +1 @@
-3a591009b2d71b3c8825c407d6b9be74bdd44d77c0c015d55d961232a3f0f9a4
+d38f7f6bbd27710e139b96d62b84aa76d97b6926b9acb21af98f13c47c32ed09
--- a/obj/Debug/netcoreapp3.1/rmutr_report.dll
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.dll
--- a/obj/Debug/netcoreapp3.1/rmutr_report.pdb
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.pdb
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17401239669095019
+17403867488254078
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-17401239669095019
+17404853499076394