update

Controllers/Budget.Controller.cs

@@ -25,6 +25,7 @@ namespace rmutr_report.Controllers
         {
             _setting = setting;
         }
+
         [SwaggerOperation(Summary = "รายงานงบประมาณแยกตามพื้นที่")]
         [HttpPost, Route("reports/budget_report/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -80,6 +81,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation(Summary = "รายงานสรุปงบประมาณรายจ่าย")]
         [HttpPost, Route("reports/budget_summary_report/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -244,6 +246,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("สรุปรายการสิ่งก่อสร้างที่เสนอขอ")]
         [HttpPost, Route("reports/summary_building_table/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -306,6 +309,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("สรุปรายการครุภัณฑ์ที่เสนอขอ")]
         [HttpPost, Route("reports/summary_durable_articles_table/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -351,6 +355,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("ตารางและรายงานสรุปคำขอในส่วนของโครงการทั้งหมด")]
         [HttpPost, Route("reports/summary_all_project_table/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -396,6 +401,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("สรุปการเสนอของบประมาณโครงการประจำปีงบประมาณ")]
         [HttpPost, Route("reports/summary_project_budget_proposals/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -449,6 +455,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("งบประมาณแผ่นดิน พื้นฐาน")]
         [HttpPost, Route("reports/basic_plan/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -769,6 +776,7 @@ namespace rmutr_report.Controllers
                     return Ok();
             }
         }
+
         [SwaggerOperation("งบประมาณแผ่นดิน แผนบูรณาการ+แผนยุทธศาสตร์")]
         [HttpPost, Route("reports/integration_strategic_plan/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -1163,6 +1171,7 @@ namespace rmutr_report.Controllers
                     "integration_strategic_plan_" + date + ".xlsx");
             }
         }
+
         [SwaggerOperation("งบประมาณแผ่นดิน รวมทุกแผน")]
         [HttpPost, Route("reports/basic_plan_all/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -1705,6 +1714,7 @@ namespace rmutr_report.Controllers
                     "basic_plan_all_" + date + ".xlsx");
             }
         }
+
         [SwaggerOperation("ตารางสรุปประเด็นยุทธศาสตร์ เป้าหมายหลัก  ตัวชี้วัดและกลยุทธ์")]
         [HttpPost, Route("reports/summary_strategic/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -1743,6 +1753,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("ร.15 ประมาณการรายรับจากการจัดการศึกษา")]
         [HttpPost, Route("reports/budget_expenditure_from_revenue/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -1967,6 +1978,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("สรุปรายรับและจัดสรรตามเกณฑ์")]
         [HttpPost, Route("reports/revenue_estimates/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -2431,6 +2443,7 @@ namespace rmutr_report.Controllers
                     "revenue_estimates_" + date + ".xlsx");
             }
         }
+
         [SwaggerOperation("ตารางสรุปงบประมาณประจำปี แยกตามผลผลิตของมหาวิทยาลัย")]
         [HttpPost, Route("reports/summary_budget_university/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -2468,18 +2481,109 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("แผนงานบุคลากรภาครัฐ")]
         [HttpPost, Route("reports/budget_expenditure_report_from_revenue/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
         public IActionResult GetBudgetExpenditureRevenueReport([FromRoute] string type,
             [FromBody] budget_expenditure_report_from_revenue budget)
         {
+            int no = 1;
+
             var b = budget.budgets.ToArray();
+            var budgets1 = budget.budgets.ToList();
             foreach (var bb in b)
             {
                 bb.personnel_list_s = new List<personnel_list> { bb.personnel_lists };
+                foreach (var detail in bb.personnel_list_s)
+                {
+                    foreach (var detail2 in detail.budget_personnel_lists)
+                    {
+                        if (detail2.rate != null)
+                        {
+                            detail2.text1 = "อัตรา";
                         }
 
+                        if (detail.budget_personnel_lists.Count() == 1)
+                        {
+                            detail.budget_personnel_lists[0].topic = "งบบุคลากร";
+                        }
+
+                        foreach (var detail3 in detail2.budget_personnel_lists_2)
+                        {
+                            if (detail3.rate != null)
+                            {
+                                detail3.text1 = "อัตรา";
+                            }
+
+                            int no2 = 1;
+
+                            if (detail3.topic != null)
+                            {
+                                detail3.row_no = no;
+                                no++;
+                            }
+
+                            foreach (var detail4 in detail3.budget_rates)
+                            {
+                                if (detail4.rate != null)
+                                {
+                                    detail4.text1 = "อัตรา";
+                                }
+
+                                int no3 = 1;
+                                if (detail4.topic != null)
+                                {
+                                    detail4.row_no = no2;
+                                    no2++;
+                                }
+
+                                foreach (var detail5 in detail4.details)
+                                {
+                                    int no4 = 1;
+                                    if (detail5.rate != null)
+                                    {
+                                        detail5.text1 = "อัตรา";
+                                    }
+
+                                    if (detail5.position_level != null)
+                                    {
+                                        detail5.row_no = no3;
+                                        no3++;
+                                    }
+
+                                    if (detail.budget_personnel_lists.Count() == 2)
+                                    {
+                                        detail.budget_personnel_lists[0].topic = "งบบุคลากร";
+                                        detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
+                                        detail.budget_personnel_lists[1].text1 = null;
+                                        detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null;
+                                        detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null;
+                                        detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
+                                            .row_no = null;
+                                        detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
+                                            .text1 = null;
+                                        detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
+                                            .details[0].text1 = null;
+                                    }
+
+                                    foreach (var detail6 in detail5.details2)
+                                    {
+                                        if (detail6.topic != null)
+                                        {
+                                            detail6.row_no = no4;
+                                            no4++;
+                                            detail6.text1 = "บาท";
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+
             var budgetExpenditure = new List<budget_expenditure_report_from_revenue>() { budget };
 
             Report report = new Report();
@@ -2511,8 +2615,8 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
-        [SwaggerOperation("สรุปงบประมาณแผนปฏิบัติราชการประจำปี")]
 
+        [SwaggerOperation("สรุปงบประมาณแผนปฏิบัติราชการประจำปี")]
         [HttpPost, Route("reports/summary_government_budget_plan/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
         public IActionResult GetSumGovernmentPlanReport([FromRoute] string type,
@@ -2656,13 +2760,13 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("แผนงาน/ผลผลิตของมหาวิทยาลัยฯ")]
         [HttpPost, Route("reports/budget_projects/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
         public IActionResult GetBudgetProjectsReport([FromRoute] string type,
             [FromBody] budget_projects budget)
         {
-            
             var budgets = new List<budget_projects>() { budget };
 
             Report report = new Report();
@@ -2693,13 +2797,13 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("ข้อมูลงบประมาณเงินแผ่นดิน งบประมาณเงินรายได้")]
         [HttpPost, Route("reports/total_budget/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
         public IActionResult GetBudgetTotalReport([FromRoute] string type,
             [FromBody] total_budget budget)
         {
-           
             var summaryBudget = new List<total_budget>() { budget };
 
             Report report = new Report();
@@ -2731,6 +2835,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("ร.6 สรุปโครงการงบดำเนินงาน")]
         [HttpPost, Route("reports/summary_subsidy_projects/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -2787,13 +2892,13 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("ตารางเป้าหมายผลผลิต")]
         [HttpPost, Route("reports/target_budget_project/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
         public IActionResult GetTargetBudgetReport([FromRoute] string type,
             [FromBody] List<target_budget_project> targetBudgetProjectsbudget)
         {
-            
             Report report = new Report();
             report.Load(_setting.report_path + "target_budget_project.frx");
             report.RegisterData(targetBudgetProjectsbudget, "target_budget_project");
@@ -2821,6 +2926,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("แผนการรับนักศึกษา")]
         [HttpPost, Route("reports/student_admission_plan/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -2832,24 +2938,27 @@ namespace rmutr_report.Controllers
                 studentAdmission.student_type_name = "นักศึกษารับใหม่";
                 studentAdmission.text = "ภาคสมทบ";
             }
+
             if (studentAdmission.student_type_code == 2)
             {
                 studentAdmission.student_type_name = "นักศึกษาทั้งหมด";
                 studentAdmission.text = "ภาคสมทบ/ภาคพิเศษ";
             }
+
             if (studentAdmission.student_type_code == 3)
             {
                 studentAdmission.student_type_name = "นักศึกษาสำเร็จ";
                 studentAdmission.text = "ภาคสมทบ/ภาคพิเศษ";
             }
+
             foreach (var detail in studentAdmission.data)
             {
                 if (detail.topic_type == 4)
                 {
                     detail.topic = "- " + detail.topic;
                 }
-                
             }
+
             var studentAdmissionPlans = new List<student_admission_plan>() { studentAdmission };
             Report report = new Report();
             report.Load(_setting.report_path + "student_admission_plan.frx");
@@ -2878,6 +2987,7 @@ namespace rmutr_report.Controllers
 
             return Ok();
         }
+
         [SwaggerOperation("รายงานภาพรวมนักศึกษา")]
         [HttpPost, Route("reports/student_overview/{type}")]
         [ApiExplorerSettings(GroupName = "reports")]
@@ -2888,34 +2998,42 @@ namespace rmutr_report.Controllers
             {
                 studentOverview.student_type_name = "นักศึกษาทั้งหมด";
             }
+
             if (studentOverview.student_type_code == 2)
             {
                 studentOverview.student_type_name = "นักศึกษารับใหม่";
             }
+
             if (studentOverview.student_type_code == 3)
             {
                 studentOverview.student_type_name = "นักศึกษาสำเร็จ";
             }
+
             if (studentOverview.student_type_code == 4)
             {
                 studentOverview.student_type_name = "นักศึกษาปกติทั้งหมด";
             }
+
             if (studentOverview.student_type_code == 5)
             {
                 studentOverview.student_type_name = "นักศึกษาปกติรับใหม่";
             }
+
             if (studentOverview.student_type_code == 6)
             {
                 studentOverview.student_type_name = "นักศึกษาปกติสำเร็จ";
             }
+
             if (studentOverview.student_type_code == 7)
             {
                 studentOverview.student_type_name = "นักศึกษาสมทบ/พิเศษทั้งหมด";
             }
+
             if (studentOverview.student_type_code == 8)
             {
                 studentOverview.student_type_name = "นักศึกษาสมทบ/พิเศษรับใหม่";
             }
+
             if (studentOverview.student_type_code == 9)
             {
                 studentOverview.student_type_name = "นักศึกษาสมทบ/พิเศษสำเร็จ";

Models/budget/budget_expenditure_report_from_revenue.cs

@@ -17,50 +17,75 @@ namespace rmutr_report.Models
         //public string agency_category_name { get; set; } //ผลผลิต
         public decimal? total { get; set; }
         public List<budget> budgets { get; set; }
+        //public List<budget> budgets2 { get; set; }
     }
 
     public class budget
     {
+        public string topic { get; set; } 
         public decimal? total { get; set; } //แผนงาน
-
        public personnel_list personnel_lists { get; set; }
         public List<personnel_list> personnel_list_s { get; set; }
     }
 
     public class personnel_list //รายการบุคลกร
     {
+        public string topic { get; set; } 
         public decimal? total { get; set; }
         public List<budget_personnel_list> budget_personnel_lists { get; set; }
+        public List<budget_personnel_list> budget_personnel_lists2 { get; set; }
     }
 
     public class budget_personnel_list //งบบุคลากร
     {
+        public string topic { get; set; } 
         public decimal? rate { get; set; }
         public decimal? total { get; set; }
+        public string text1 { get; set; } 
+        public string text2 { get; set; } 
         public List<budget_personnel_list_2> budget_personnel_lists_2 { get; set; }
     }
 
     public class budget_personnel_list_2 //ค่าจ้างชั่วคราว
     {
+        public int? row_no { get; set; }
         public string topic { get; set; }
         public decimal? rate { get; set; }
         public decimal? total { get; set; }
+        public string text1 { get; set; } 
+        public string text2 { get; set; } 
         public List<budget_rate> budget_rates { get; set; }
     }
 
     public class budget_rate //อัตราเดิม/อัตราใหม่
     {
+        public int? row_no { get; set; }
         public string topic { get; set; }
         public decimal? rate { get; set; }
         public decimal? total { get; set; }
+        public string text1 { get; set; } 
+        public string text2 { get; set; } 
         public List<details> details { get; set; }
     }
 
     public class details //อันรองลงมา
     {
+        public int? row_no { get; set; }
         public string position_level { get; set; }
         public string qualification { get; set; }
         public decimal? rate { get; set; }
         public decimal? total { get; set; }
+        public string text1 { get; set; } 
+        public string text2 { get; set; } 
+        public List<details2> details2  { get; set; }
     }
+    public class details2 //อันรองลงมา
+    {
+        public int? row_no { get; set; }
+        public string topic { get; set; }
+     
+        public decimal? total { get; set; }
+        public string text1 { get; set; } 
+    }
+
 }

obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig

@@ -7,4 +7,4 @@ build_property.InvariantGlobalization =
 build_property.PlatformNeutralAssembly = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = rmutr_report
-build_property.ProjectDir = C:\Users\USER\RiderProjects\rmutr_report\
+build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\

obj/project.assets.json

@@ -2149,14 +2149,14 @@
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
+      "projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
       "projectName": "rmutr_report",
-      "projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
+      "projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
       "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\",
-      "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\",
+      "outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\",
       "projectStyle": "PackageReference",
       "configFilePaths": [
-        "C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config",
+        "C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config",
         "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config",
         "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
       ],

obj/project.nuget.cache

@@ -1,8 +1,8 @@
 {
   "version": 2,
-  "dgSpecHash": "hE1gzfQgC+4GgyoQuRqmEmX/hadpdQNNAtzoJP3ojRoJ0s4QtHzCqAzsknxDVb7FYfcX4JoJw8yCmPluWoUxgg==",
+  "dgSpecHash": "TgdSlhcNLrmoGcymKBKtBNUewM9z9QdY0FESfevGdFzEBUl5TotP+ysyCZqFpczcvGDJdBKPRCtfqngiN8LZRQ==",
   "success": true,
-  "projectFilePath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
+  "projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
   "expectedPackageFiles": [
     "C:\\Users\\USER\\.nuget\\packages\\closedxml\\0.96.0\\closedxml.0.96.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\documentformat.openxml\\2.16.0\\documentformat.openxml.2.16.0.nupkg.sha512",

obj/project.packagespec.json

@@ -1 +1 @@
-"restore":{"projectUniqueName":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}}
+"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}}

obj/rider.project.restore.info

@@ -1 +1 @@
-16921836306235276
+16926162047873347

obj/rmutr_report.csproj.nuget.dgspec.json

@@ -1,20 +1,20 @@
 {
   "format": 1,
   "restore": {
-    "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": {}
+    "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": {}
   },
   "projects": {
-    "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": {
+    "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
+        "projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
         "projectName": "rmutr_report",
-        "projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
+        "projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
         "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\",
-        "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\",
+        "outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\",
         "projectStyle": "PackageReference",
         "configFilePaths": [
-          "C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config",
+          "C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config",
           "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
         ],

wwwroot/reports/budget_expenditure_report_from_revenue.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="07/14/2023 16:20:41" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/21/2023 18:04:00" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="budget_expenditure_report_from_revenue" ReferenceName="budget_expenditure_report_from_revenue" DataType="null" Enabled="true">
       <Column Name="academic_year_name_th" DataType="System.String"/>
@@ -8,25 +8,45 @@
       <Column Name="agency_name_th" DataType="System.String"/>
       <Column Name="total" DataType="System.Decimal"/>
       <BusinessObjectDataSource Name="budgets" DataType="System.Int32" Enabled="true">
+        <Column Name="topic" DataType="System.String"/>
         <Column Name="total" DataType="System.Decimal"/>
         <BusinessObjectDataSource Name="personnel_list_s" DataType="System.Int32" Enabled="true">
+          <Column Name="topic" DataType="System.String"/>
           <Column Name="total" DataType="System.Decimal"/>
           <BusinessObjectDataSource Name="budget_personnel_lists" DataType="System.Int32" Enabled="true">
+            <Column Name="topic" DataType="System.String"/>
             <Column Name="rate" DataType="System.Decimal"/>
             <Column Name="total" DataType="System.Decimal"/>
+            <Column Name="text1" DataType="System.String"/>
+            <Column Name="text2" DataType="System.String"/>
             <BusinessObjectDataSource Name="budget_personnel_lists_2" DataType="System.Int32" Enabled="true">
+              <Column Name="row_no" DataType="System.Int32"/>
               <Column Name="topic" DataType="System.String"/>
               <Column Name="rate" DataType="System.Decimal"/>
               <Column Name="total" DataType="System.Decimal"/>
+              <Column Name="text1" DataType="System.String"/>
+              <Column Name="text2" DataType="System.String"/>
               <BusinessObjectDataSource Name="budget_rates" DataType="System.Int32" Enabled="true">
+                <Column Name="row_no" DataType="System.Int32"/>
                 <Column Name="topic" DataType="System.String"/>
                 <Column Name="rate" DataType="System.Decimal"/>
                 <Column Name="total" DataType="System.Decimal"/>
+                <Column Name="text1" DataType="System.String"/>
+                <Column Name="text2" DataType="System.String"/>
                 <BusinessObjectDataSource Name="details" DataType="System.Int32" Enabled="true">
+                  <Column Name="row_no" DataType="System.Int32"/>
                   <Column Name="position_level" DataType="System.String"/>
                   <Column Name="qualification" DataType="System.String"/>
                   <Column Name="rate" DataType="System.Decimal"/>
                   <Column Name="total" DataType="System.Decimal"/>
+                  <Column Name="text1" DataType="System.String"/>
+                  <Column Name="text2" DataType="System.String"/>
+                  <BusinessObjectDataSource Name="details2" DataType="System.Int32" Enabled="true">
+                    <Column Name="row_no" DataType="System.Int32"/>
+                    <Column Name="topic" DataType="System.String"/>
+                    <Column Name="total" DataType="System.Decimal"/>
+                    <Column Name="text1" DataType="System.String"/>
+                  </BusinessObjectDataSource>
                 </BusinessObjectDataSource>
               </BusinessObjectDataSource>
             </BusinessObjectDataSource>
@@ -36,7 +56,7 @@
     </BusinessObjectDataSource>
   </Dictionary>
   <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="450" Watermark.Font="Arial, 60pt">
-    <DataBand Name="Data2" Width="945" Height="207.9">
+    <DataBand Name="Data2" Width="945" Height="207.9" StartNewPage="true" DataSource="budget_expenditure_report_from_revenue">
       <LineObject Name="Line1" Left="85.05" Top="198.45" Width="425.25" Diagonal="true"/>
       <LineObject Name="Line4" Left="765.45" Top="198.45" Width="132.3" Diagonal="true"/>
       <TextObject Name="Text5" Top="170.1" Width="75.6" Height="37.8" Text="ภาค :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
@@ -51,48 +71,54 @@
       <TextObject Name="Text6" Left="85.05" Top="94.5" Width="425.25" Height="37.8" Text="[budget_expenditure_report_from_revenue.parent_agency_name]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text2" Top="37.8" Width="945" Height="37.8" Text="( 1 ตุลาคม 2565 - 30 กันยายน 2566 )" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
       <TextObject Name="Text1" Width="945" Height="37.8" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [budget_expenditure_report_from_revenue.academic_year_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <DataBand Name="Data3" Top="213.09" Width="945" Height="28.35" CanShrink="true" DataSource="budgets">
+      <DataBand Name="Data3" Top="214.25" Width="945" Height="28.35" CanShrink="true" DataSource="budgets">
         <LineObject Name="Line5" Left="727.65" Top="28.35" Width="141.75" Diagonal="true"/>
-        <TextObject Name="Text11" Width="226.8" Height="28.35" Text="แผนงานบุคลากรภาครัฐ" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
+        <TextObject Name="Text11" Width="510.3" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.topic]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
         <TextObject Name="Text12" Left="727.65" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
         <TextObject Name="Text13" Left="869.4" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 18pt"/>
-        <DataBand Name="Data4" Top="246.64" Width="945" Height="28.35" DataSource="personnel_list_s">
+        <DataBand Name="Data4" Top="248.95" Width="945" Height="28.35" DataSource="personnel_list_s">
           <LineObject Name="Line6" Left="699.3" Top="28.35" Width="141.75" Diagonal="true"/>
           <TextObject Name="Text16" Left="841.05" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-          <TextObject Name="Text14" Left="18.9" Width="207.9" Height="28.35" Text="รายการบุคลากร" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
+          <TextObject Name="Text14" Left="18.9" Width="491.4" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
           <TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-          <DataBand Name="Data5" Top="280.18" Width="945" Height="28.35" DataSource="budget_personnel_lists">
+          <DataBand Name="Data5" Top="283.65" Width="945" Height="28.35" DataSource="budget_personnel_lists">
             <LineObject Name="Line7" Left="689.85" Top="28.35" Width="122.85" Diagonal="true"/>
             <TextObject Name="Text20" Left="689.85" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-            <TextObject Name="Text17" Left="37.8" Width="207.9" Height="28.35" Text="งบบุคลากร" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
+            <TextObject Name="Text17" Left="37.8" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
             <TextObject Name="Text18" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.rate]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-            <TextObject Name="Text19" Left="623.7" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+            <TextObject Name="Text19" Left="623.7" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
             <TextObject Name="Text21" Left="812.7" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-            <DataBand Name="Data6" Top="313.73" Width="945" Height="28.35" DataSource="budget_personnel_lists_2">
+            <DataBand Name="Data6" Top="318.35" Width="945" Height="28.35" DataSource="budget_personnel_lists_2">
               <LineObject Name="Line8" Left="661.5" Top="28.35" Width="122.85" Diagonal="true"/>
-              <TextObject Name="Text22" Left="47.25" Width="37.8" Height="28.35" Text="[Row#]." HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+              <TextObject Name="Text22" Left="47.25" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
               <TextObject Name="Text23" Left="85.05" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
               <TextObject Name="Text24" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.rate]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-              <TextObject Name="Text25" Left="614.25" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+              <TextObject Name="Text25" Left="614.25" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
               <TextObject Name="Text26" Left="661.5" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
               <TextObject Name="Text27" Left="784.35" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-              <DataBand Name="Data7" Top="347.27" Width="945" Height="28.35" DataSource="budget_rates">
+              <DataBand Name="Data7" Top="353.05" Width="945" Height="28.35" DataSource="budget_rates">
-                <TextObject Name="Text28" Left="85.05" Width="37.8" Height="28.35" Text="[Row#]." HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+                <TextObject Name="Text28" Left="85.05" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <TextObject Name="Text29" Left="122.85" Width="302.4" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
                 <TextObject Name="Text30" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-                <TextObject Name="Text31" Left="567" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+                <TextObject Name="Text31" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <TextObject Name="Text32" Left="633.15" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <TextObject Name="Text33" Left="756" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
                 <LineObject Name="Line9" Left="633.15" Top="28.35" Width="122.85" Diagonal="true"/>
-                <DataBand Name="Data1" Top="380.82" Width="945" Height="28.35" DataSource="details">
+                <DataBand Name="Data1" Top="387.75" Width="945" Height="28.35" DataSource="details">
                   <LineObject Name="Line10" Left="633.15" Top="28.35" Width="94.5" Diagonal="true"/>
                   <TextObject Name="Text39" Left="633.15" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-                  <TextObject Name="Text34" Left="122.85" Width="37.8" Height="28.35" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+                  <TextObject Name="Text34" Left="122.85" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <TextObject Name="Text35" Left="160.65" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.position_level]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <TextObject Name="Text36" Left="340.2" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.qualification]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <TextObject Name="Text37" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.rate]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
-                  <TextObject Name="Text38" Left="567" Width="47.25" Height="28.35" Text="อัตรา" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+                  <TextObject Name="Text38" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
                   <TextObject Name="Text40" Left="727.65" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
+                  <DataBand Name="Data8" Top="422.44" Width="945" Height="28.35" DataSource="details2">
+                    <TextObject Name="Text41" Left="160.65" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
+                    <TextObject Name="Text42" Left="198.45" Width="321.3" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.topic]" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
+                    <TextObject Name="Text43" Left="538.65" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
+                    <TextObject Name="Text44" Left="633.15" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.text1]" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
+                  </DataBand>
                 </DataBand>
               </DataBand>
             </DataBand>