add report

2023-08-16 12:01:11 +07:00
parent 7132b7c4ed
commit 9fd0c16fbf
20 changed files with 250 additions and 145 deletions
--- a/Controllers/GovernmentBudget.Controller.cs
+++ b/Controllers/GovernmentBudget.Controller.cs
@@ -62,7 +62,7 @@ namespace rmutr_report.Controllers

            return Ok();
        }
-        [SwaggerOperation("การจัดสรรงบประมาณแผ่นดิน พื้นฐาน+ยุทธศาตร์")]
+        [SwaggerOperation("การจัดสรรงบประมาณแผ่นดินรวมทุกแผนงาน, แผนงานบุคลากร, พื้นฐาน+ยุทธศาตร์")]
        [HttpPost, Route("reports/budget_government_allocate/{type}")] // (พื้นฐาน+ยุทธศาตร์)
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetInStrAllocateReport([FromRoute] string type,
--- a/Controllers/Personnel.Controller.cs
+++ b/Controllers/Personnel.Controller.cs
@@ -27,7 +27,7 @@ namespace rmutr_report.Controllers
        {
            this._setting = setting;
        }
-
+         [SwaggerOperation("ข้อมูลจำนวนบุคลากร")] 
        [HttpPost, Route("reports/personnel_summary/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetHrReport([FromRoute] string type, [FromBody] personnel_summary personnel_summarys)
@@ -84,7 +84,7 @@ namespace rmutr_report.Controllers

            return Ok();
        }
-
+        [SwaggerOperation("จำนวนบุคลากร สายวิชาการ และ สายสนับสนุน")] 
        [HttpPost, Route("reports/man_power/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetManReport([FromRoute] string type, [FromBody] List<man_power> man_powers)
@@ -128,7 +128,7 @@ namespace rmutr_report.Controllers

            return Ok();
        }
-
+        [SwaggerOperation("จำนวนบุคลากร สายสนับสนุน")] 
        [HttpPost, Route("reports/data_line_support/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetDataLineReport([FromRoute] string type, [FromBody] data_line_support data_line_supports)
@@ -172,7 +172,7 @@ namespace rmutr_report.Controllers

            return Ok();
        }
-
+ [SwaggerOperation("จำนวนบุคลากร สายวิชาการ จำแนกตามอัตรา มีคนครอง และอัตราว่าง")] 
        [HttpPost, Route("reports/data_line_academic/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetDataLineAcaReport([FromRoute] string type,
@@ -217,7 +217,7 @@ namespace rmutr_report.Controllers

            return Ok();
        }
-
+        [SwaggerOperation("จำนวนบุคลากร สายวิชาการ จำแนกตามอัตรา มีคนครอง และอัตราว่าง")] 
        [HttpPost, Route("reports/qualifications_teacher/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetQualificationsTeacherReport([FromRoute] string type,
@@ -262,7 +262,7 @@ namespace rmutr_report.Controllers

            return Ok();
        }
-
+[SwaggerOperation("จำนวนบุคลากร สายวิชาการ ตามตำแหน่งทางวิชาการ")] 
        [HttpPost, Route("reports/academic_position/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetAcademicPositionReport([FromRoute] string type,
@@ -307,7 +307,7 @@ namespace rmutr_report.Controllers

            return Ok();
        }
-
+        [SwaggerOperation("หนังสือแจ้งผลการเลื่อนค่าตอบแทนพนักงานราชการ")] 
        [HttpPost, Route("reports/postponement_compensation/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetPostponementCompensationReport([FromRoute] string type,
@@ -494,7 +494,7 @@ namespace rmutr_report.Controllers

            return Ok();
        }
-
+        [SwaggerOperation("พนักงานราชการ")] 
        [HttpPost, Route("reports/personnel_salary_government_employee/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetPersonSalaryReport([FromRoute] string type,
@@ -1012,7 +1012,7 @@ namespace rmutr_report.Controllers
            }
        }

-
+        [SwaggerOperation("ข้าราชการ")] 
        [HttpPost, Route("reports/personnel_salary_government/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetPersonSalaryGovernmentReport([FromRoute] string type,
@@ -2105,7 +2105,7 @@ namespace rmutr_report.Controllers
            }
        }

-
+        [SwaggerOperation("ลูกจ้างประจํา")] 
        [HttpPost, Route("reports/personnel_salary_permanent/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetPersonSalaryReport([FromRoute] string type,
@@ -2796,7 +2796,7 @@ namespace rmutr_report.Controllers
                    "personnel_permanent_" + date + ".xlsx");
            }
        }
-
+[SwaggerOperation("ลูกจ้างชั่วคราว")] 
        [HttpPost, Route("reports/personnel_salary_temporary/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetTemporaryReport([FromRoute] string type,
@@ -3236,7 +3236,7 @@ namespace rmutr_report.Controllers
                    "personnel_temporary_" + date + ".xlsx");
            }
        }
-
+        [SwaggerOperation("พนักงานมหาวิทยาลัย")] 
        [HttpPost, Route("reports/personnel_salary_university/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetPersonSalaryUniversityReport([FromRoute] string type,
@@ -4130,7 +4130,7 @@ namespace rmutr_report.Controllers
            }
        }

-
+        [SwaggerOperation("ค่าตอบแทนพนักงานราชการ")] 
        [HttpPost, Route("reports/set_personnel_budget/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetSetPersonBudgetReport([FromRoute] string type,
@@ -4808,7 +4808,7 @@ namespace rmutr_report.Controllers
                    "personnel_" + date + ".xlsx");
            }
        }
-
+        [SwaggerOperation("การตั้งงบประมาณค่าใช้จ่ายบุคลากร")] 
        [HttpPost, Route("reports/personnel_expense_budget/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetSetPersonExBudgetReport([FromRoute] string type,
@@ -6214,7 +6214,7 @@ namespace rmutr_report.Controllers
                    "personnel_expense_budget" + date + ".xlsx");
            }
        }
-
+        [SwaggerOperation("บุคลากร งบประมาณแผ่นดิน")] 
        [HttpPost, Route("reports/national_budget/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetNationalBudgetReport([FromRoute] string type,
@@ -6479,7 +6479,7 @@ namespace rmutr_report.Controllers
                    "national_budget_" + date + ".xlsx");
            }
        }
-
+        [SwaggerOperation("งบประมาณ MTEF")] 
        [HttpPost, Route("reports/mtef_personnel/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetMtefReport([FromRoute] string type,
@@ -6862,7 +6862,7 @@ namespace rmutr_report.Controllers
                    "mtef_personnel_" + date + ".xlsx");
            }
        }
-
+        [SwaggerOperation("ข้อมูลการตั้งงบประมาณค่าใช้จ่ายบุคลากร")] 
        [HttpPost, Route("reports/set_personnel_budget_university/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetSetPersonUniBudgetReport([FromRoute] string type,
@@ -8817,7 +8817,7 @@ namespace rmutr_report.Controllers
                    "set_personnel_budget_university_" + date + ".xlsx");
            }
        }
-
+        [SwaggerOperation("การตั้งงบประมาณค่าใช้จ่ายบุคลากร ของลูกจ้างประจำ")] 
        [HttpPost, Route("reports/set_personnel_budget_permanent/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetSetPersonPermanentReport([FromRoute] string type,
@@ -9482,7 +9482,7 @@ namespace rmutr_report.Controllers
                    "set_personnel_budget_permanent_" + date + ".xlsx");
            }
        }
-
+        [SwaggerOperation("รายละเอียดข้อเสนอวงเงิน, สรุปข้อเสนอวงเงิน")] 
        [HttpPost, Route("reports/budget_expenditure_proposal/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetPersonDetailReport([FromRoute] string type,
--- a/Controllers/PersonnelReportController.cs
+++ b/Controllers/PersonnelReportController.cs
@@ -11,7 +11,7 @@ using Swashbuckle.AspNetCore.Annotations;

 namespace rmutr_report.Controllers
 {
-    [SwaggerTag("สำหรับรายงาน HR")]
+    [SwaggerTag("สำหรับรายงานบุคลากร")]
    public class PersonnelReport : Controller
    {
        readonly Setting _setting;
--- a/Controllers/Summary.Controller.cs
+++ b/Controllers/Summary.Controller.cs
@@ -25,7 +25,7 @@ namespace rmutr_report.Controllers
        {
            this._setting = setting;
        }
-
+        [SwaggerOperation("สรุปแผนความต้องการ รายการครุภัณฑ์")]
        [HttpPost, Route("reports/summary_of_equipment/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetSum1Report([FromRoute] string type,
@@ -298,7 +298,7 @@ namespace rmutr_report.Controllers
            // }
            return Ok();
        }
-
+        [SwaggerOperation("สรุปแผนความต้องการ รายการครุภัณฑ์ 5 ปี")]
        [HttpPost, Route("reports/summary_of_equipment_five_year/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetEquipmentReport([FromRoute] string type,
@@ -859,7 +859,7 @@ namespace rmutr_report.Controllers
            }
        }

-
+        [SwaggerOperation("รายละเอียดคำชี้แจงค่าครุภัณฑ์")]
        [HttpPost, Route("reports/statement_of_equipment/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetStEquipmentReport([FromRoute] string type,
@@ -950,7 +950,7 @@ namespace rmutr_report.Controllers
            return Ok();
        }

-
+        [SwaggerOperation("สรุปแผนความต้องการรายการก่อสร้างอาคารหรือสิ่งก่อสร้าง")]
        [HttpPost, Route("reports/summary_building_construction/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetSum2Report([FromRoute] string type,
@@ -1584,5 +1584,50 @@ namespace rmutr_report.Controllers
                }
            }
        }
+        [SwaggerOperation("สรุปงบลงทุน")]
+        [HttpPost, Route("reports/investment_budget_summary/{type}")]
+        [ApiExplorerSettings(GroupName = "reports")]
+        public IActionResult GetInvestmentReport([FromRoute] string type,
+            [FromBody] investment_budget_summary investmentBudget)
+        {
+            foreach (var detail in investmentBudget.data)
+            {
+                if (detail.topic_type==1)
+                {
+                    detail.row_no = null;
+                } 
+                if (detail.topic_type==3)
+                {
+                    detail.row_no = null;
+                } 
+            }
+         var investmentBudgetSummaries = new List<investment_budget_summary>() { investmentBudget };
+            Report report = new Report();
+            report.Load(_setting.report_path + "investment_budget_summary.frx");
+            report.RegisterData(investmentBudgetSummaries, "investment_budget_summary");
+            report.Prepare();
+
+            MemoryStream stream = new MemoryStream();
+            switch (type)
+            {
+                case "pdf":
+                    PDFExport pdf = new PDFExport();
+                    report.Export(pdf, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "application/pdf");
+
+                case "xls":
+                case "xlsx":
+                    Excel2007Export excel = new Excel2007Export();
+                    report.Export(excel, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(
+                        stream,
+                        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                        "investment_budget_summary" + ".xlsx");
+            }
+
+            return Ok();
+        }
    }
 }
--- a/Models/budget/investment_budget_summary.cs
+++ b/Models/budget/investment_budget_summary.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace rmutr_report.Models
+{
+    public class investment_budget_summary
+    {
+        public string budget_year { get; set; }
+        // public decimal? total_request_count_item { get; set; }
+        // public decimal? total_request_amount { get; set; }
+        // public decimal? total_offer_count_item { get; set; }
+        // public decimal? total_offer_amount { get; set; }
+        public List<investment_budget_summary_detail> data { get; set; }
+    }
+
+    public class investment_budget_summary_detail
+    {
+        public int? topic_type { get; set; }
+        public string row_no { get; set; }
+        public string topic { get; set; }
+        public decimal? request_count_item { get; set; }
+        public decimal? request_amount { get; set; }
+        public decimal? offer_count_item { get; set; }
+        public decimal? offer_amount { get; set; }
+    }
+}
--- a/bin/Debug/net5.0/rmutr_report.dll
+++ b/bin/Debug/net5.0/rmutr_report.dll
--- a/bin/Debug/net5.0/rmutr_report.pdb
+++ b/bin/Debug/net5.0/rmutr_report.pdb
--- 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/ref/rmutr_report.dll
+++ b/obj/Debug/net5.0/ref/rmutr_report.dll
--- a/obj/Debug/net5.0/refint/rmutr_report.dll
+++ b/obj/Debug/net5.0/refint/rmutr_report.dll
--- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-880859379cd997a9162e3f5a8bf1827cf99cdc7d
+99ef312a48329e42fc9ff666e8db622340dcdeb7
--- a/obj/Debug/net5.0/rmutr_report.dll
+++ b/obj/Debug/net5.0/rmutr_report.dll
--- a/obj/Debug/net5.0/rmutr_report.pdb
+++ b/obj/Debug/net5.0/rmutr_report.pdb
--- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8a21b47cb8ccf1667e9a1e072a5dd8d9abbe5dc0
+51192c87ebcc0d859fc33a38799a58739bd69342
--- 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.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-16920967126989349
+16921620219163155
--- a/wwwroot/reports/budget_summary_report.frx
+++ b/wwwroot/reports/budget_summary_report.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="08/10/2023 17:45:45" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="08/16/2023 11:52:03" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="budget_summary_report" ReferenceName="budget_summary_report" DataType="null" Enabled="true">
      <Column Name="budget_year" DataType="System.String"/>
@@ -365,8 +365,8 @@
        </TableRow>
      </TableObject>
    </ReportTitleBand>
-    <DataBand Name="Data1" Top="270.4" Width="1247.4">
-      <DataBand Name="Data2" Top="276.19" Width="1247.4" Height="37.8" DataSource="summary">
+    <DataBand Name="Data1" Top="269.09" Width="1247.4">
+      <DataBand Name="Data2" Top="273.59" Width="1247.4" Height="37.8" DataSource="summary">
        <TableObject Name="Table4" Width="1247.4" Height="37.8">
          <TableColumn Name="Column25" Width="47.25"/>
          <TableColumn Name="Column26" Width="453.6"/>
@@ -2706,9 +2706,9 @@
      </DataBand>
    </DataBand>
  </ReportPage>
-  <ReportPage Name="แผนบูรณาการ" PaperWidth="350" Watermark.Font="Arial, 60pt">
+  <ReportPage Name="แผนบูรณาการ_แผนยุทธศาสตร์" PaperWidth="350" Watermark.Font="Arial, 60pt">
    <PageHeaderBand Name="PageHeader11" Width="1247.4" Height="207.9">
-      <TextObject Name="Text22" Width="1247.4" Height="37.8" Text="แผนบูรณาการ ประจำปีงบประมาณ พ.ศ. [budget_summary_report.integrated_plan_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text22" Width="1247.4" Height="37.8" Text="แผนบูรณาการ+แผนยุทธศาสตร์ ประจำปีงบประมาณ พ.ศ. [budget_summary_report.integrated_plan_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
      <TableObject Name="Table56" Top="75.6" Width="1247.4" Height="94.5">
        <TableColumn Name="Column343"/>
        <TableColumn Name="Column344" Width="567"/>
@@ -2748,8 +2748,8 @@
        </TableRow>
      </TableObject>
    </PageHeaderBand>
-    <DataBand Name="Data33" Top="213.7" Width="1247.4">
-      <DataBand Name="Data35" Top="219.49" Width="1247.4" Height="37.8" DataSource="integrated_plan_1">
+    <DataBand Name="Data33" Top="212.39" Width="1247.4">
+      <DataBand Name="Data35" Top="216.89" Width="1247.4" Height="37.8" DataSource="integrated_plan_1">
        <TableObject Name="Table60" Width="1247.4" Height="37.8">
          <TableColumn Name="Column362"/>
          <TableColumn Name="Column363" Width="567"/>
@@ -2794,7 +2794,7 @@
            </TableCell>
          </TableRow>
        </TableObject>
-        <DataBand Name="Data72" Top="263.09" Width="1247.4" Height="37.8" DataSource="integrated_plan_2">
+        <DataBand Name="Data72" Top="259.18" Width="1247.4" Height="37.8" DataSource="integrated_plan_2">
          <TableObject Name="Table119" Width="1247.4" Height="37.8">
            <TableColumn Name="Column831"/>
            <TableColumn Name="Column832" Width="567"/>
@@ -2815,113 +2815,4 @@
      </DataBand>
    </DataBand>
  </ReportPage>
-  <ReportPage Name="แผนยุทธศาสตร์" PaperWidth="350" Watermark.Font="Arial, 60pt">
-    <PageHeaderBand Name="PageHeader12" Width="1247.4" Height="207.9">
-      <TextObject Name="Text23" Width="1247.4" Height="37.8" Text="แผนยุทธศาสตร์ ประจำปีงบประมาณ พ.ศ. [budget_summary_report.strategic_plan_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <TableObject Name="Table59" Top="75.6" Width="1247.4" Height="94.5">
-        <TableColumn Name="Column356"/>
-        <TableColumn Name="Column357" Width="567"/>
-        <TableColumn Name="Column358" Width="359.1"/>
-        <TableColumn Name="Column359" Width="132.3"/>
-        <TableColumn Name="Column360" Width="122.85"/>
-        <TableRow Name="Row59" Height="94.5">
-          <TableCell Name="Cell356" Border.Lines="All" Text="ลำดับที่" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell357" Border.Lines="All" Text="ประเภท / ชื่อโครงการ" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell358" Border.Lines="All" Text="เป้าหมาย" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell359" Border.Lines="All" Text="ขอตั้ง &#13;&#10;ปี [budget_summary_report.strategic_plan_year]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell360" Border.Lines="All" Text="จัดลำดับโครงการ" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-        </TableRow>
-      </TableObject>
-      <TableObject Name="Table61" Top="170.1" Width="1247.4" Height="37.8">
-        <TableColumn Name="Column361"/>
-        <TableColumn Name="Column368" Width="567"/>
-        <TableColumn Name="Column369" Width="189"/>
-        <TableColumn Name="Column370" Width="170.1"/>
-        <TableColumn Name="Column371" Width="132.3"/>
-        <TableColumn Name="Column372" Width="122.85"/>
-        <TableRow Name="Row61" Height="37.8">
-          <TableCell Name="Cell361" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell368" Border.Lines="All" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell369" Border.Lines="All" Text="(คน/เล่ม/เรื่อง.....)" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell370" Border.Lines="All" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell371" Border.Lines="All" Text="[budget_summary_report.strategic_plan_budget]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell372" Border.Lines="All" Font="Arial, 10pt"/>
-        </TableRow>
-      </TableObject>
-      <TableObject Name="Table62" Left="633.15" Top="113.4" Width="359.1" Height="56.7" Border.Lines="All">
-        <TableColumn Name="Column373" Width="189"/>
-        <TableColumn Name="Column374" Width="170.1"/>
-        <TableRow Name="Row62" Height="56.7">
-          <TableCell Name="Cell373" Border.Lines="All" Text="หน่วยนับ" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell374" Border.Lines="All" Text="จำนวน" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-        </TableRow>
-      </TableObject>
-    </PageHeaderBand>
-    <DataBand Name="Data34" Top="213.7" Width="1247.4">
-      <DataBand Name="Data36" Top="219.49" Width="1247.4" Height="37.8" DataSource="strategic_plan_1">
-        <TableObject Name="Table63" Width="1247.4" Height="37.8">
-          <TableColumn Name="Column375"/>
-          <TableColumn Name="Column376" Width="567"/>
-          <TableColumn Name="Column377" Width="189"/>
-          <TableColumn Name="Column378" Width="170.1"/>
-          <TableColumn Name="Column379" Width="132.3"/>
-          <TableColumn Name="Column380" Width="122.85"/>
-          <TableRow Name="Row63" Height="37.8">
-            <TableCell Name="Cell375" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold">
-              <Highlight>
-                <Condition Expression="[budget_summary_report.strategic_plan_1.color]== 1" Fill.Color="255, 192, 192" Font="Arial, 10pt" ApplyFill="true" ApplyTextFill="false"/>
-              </Highlight>
-            </TableCell>
-            <TableCell Name="Cell376" Border.Lines="All" Text="[budget_summary_report.strategic_plan_1.list]" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold">
-              <Highlight>
-                <Condition Expression="[budget_summary_report.strategic_plan_1.color]== 1" Fill.Color="255, 192, 192" Font="Arial, 10pt" ApplyFill="true" ApplyTextFill="false"/>
-              </Highlight>
-            </TableCell>
-            <TableCell Name="Cell377" Border.Lines="All" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold">
-              <Highlight>
-                <Condition Expression="[budget_summary_report.strategic_plan_1.color]== 1" Fill.Color="255, 192, 192" Font="Arial, 10pt" ApplyFill="true" ApplyTextFill="false"/>
-              </Highlight>
-            </TableCell>
-            <TableCell Name="Cell378" Border.Lines="All" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold">
-              <Highlight>
-                <Condition Expression="[budget_summary_report.strategic_plan_1.color]== 1" Fill.Color="255, 192, 192" Font="Arial, 10pt" ApplyFill="true" ApplyTextFill="false"/>
-              </Highlight>
-            </TableCell>
-            <TableCell Name="Cell379" Border.Lines="All" Text="[budget_summary_report.strategic_plan_1.total_amount]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold">
-              <Formats>
-                <NumberFormat DecimalDigits="0"/>
-                <GeneralFormat/>
-              </Formats>
-              <Highlight>
-                <Condition Expression="[budget_summary_report.strategic_plan_1.color]== 1" Fill.Color="255, 192, 192" Font="Arial, 10pt" ApplyFill="true" ApplyTextFill="false"/>
-              </Highlight>
-            </TableCell>
-            <TableCell Name="Cell380" Border.Lines="All" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold">
-              <Highlight>
-                <Condition Expression="[budget_summary_report.strategic_plan_1.color]== 1" Fill.Color="255, 192, 192" Font="Arial, 10pt" ApplyFill="true" ApplyTextFill="false"/>
-              </Highlight>
-            </TableCell>
-          </TableRow>
-        </TableObject>
-        <DataBand Name="Data76" Top="263.09" Width="1247.4" Height="37.8" DataSource="strategic_plan_2">
-          <TableObject Name="Table123" Width="1247.4" Height="37.8">
-            <TableColumn Name="Column855"/>
-            <TableColumn Name="Column856" Width="567"/>
-            <TableColumn Name="Column857" Width="189"/>
-            <TableColumn Name="Column858" Width="170.1"/>
-            <TableColumn Name="Column859" Width="132.3"/>
-            <TableColumn Name="Column860" Width="122.85"/>
-            <TableRow Name="Row125" Height="37.8">
-              <TableCell Name="Cell877" Border.Lines="All" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-              <TableCell Name="Cell878" Border.Lines="All" Text="[budget_summary_report.strategic_plan_1.strategic_plan_2.list]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-              <TableCell Name="Cell879" Border.Lines="All" Text="[budget_summary_report.strategic_plan_1.strategic_plan_2.unit]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-              <TableCell Name="Cell880" Border.Lines="All" Text="[budget_summary_report.strategic_plan_1.strategic_plan_2.unit_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-              <TableCell Name="Cell881" Border.Lines="All" Text="[budget_summary_report.strategic_plan_1.strategic_plan_2.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-              <TableCell Name="Cell882" Border.Lines="All" Text="[budget_summary_report.strategic_plan_1.strategic_plan_2.remark]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            </TableRow>
-          </TableObject>
-        </DataBand>
-      </DataBand>
-    </DataBand>
-  </ReportPage>
 </Report>
--- a/wwwroot/reports/investment_budget_summary.frx
+++ b/wwwroot/reports/investment_budget_summary.frx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="08/16/2023 11:57:54" ReportInfo.CreatorVersion="2021.1.0.0">
+  <Dictionary>
+    <BusinessObjectDataSource Name="investment_budget_summary" ReferenceName="investment_budget_summary" DataType="null" Enabled="true">
+      <Column Name="budget_year" DataType="System.String"/>
+      <BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
+        <Column Name="row_no" DataType="System.String"/>
+        <Column Name="topic_type" DataType="System.Int32"/>
+        <Column Name="topic" DataType="System.String"/>
+        <Column Name="request_count_item" DataType="System.Decimal"/>
+        <Column Name="request_amount" DataType="System.Decimal"/>
+        <Column Name="offer_count_item" DataType="System.Decimal"/>
+        <Column Name="offer_amount" DataType="System.Decimal"/>
+      </BusinessObjectDataSource>
+    </BusinessObjectDataSource>
+  </Dictionary>
+  <ReportPage Name="Page1" Watermark.Font="Arial, 60pt">
+    <PageHeaderBand Name="PageHeader1" Width="718.2" Height="151.2">
+      <TableObject Name="Table1" Top="85.05" Width="718.24" Height="66.15">
+        <TableColumn Name="Column1" Width="47.27"/>
+        <TableColumn Name="Column2" Width="349.67"/>
+        <TableColumn Name="Column3" Width="160.65"/>
+        <TableColumn Name="Column4" Width="160.65"/>
+        <TableRow Name="Row1" Height="66.15">
+          <TableCell Name="Cell1" Border.Lines="All" Text="ลำดับ" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+          <TableCell Name="Cell2" Border.Lines="All" Text="ผลผลิต/รายการ" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+          <TableCell Name="Cell3" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+          <TableCell Name="Cell4" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+        </TableRow>
+      </TableObject>
+      <TextObject Name="Text1" Width="718.2" Height="28.35" Text="สรุปงบลงทุน ประจำปีงบประมาณ พ.ศ. [investment_budget_summary.budget_year]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+      <TextObject Name="Text2" Top="28.35" Width="718.2" Height="28.35" Text="กระทรวงการอุดมศึกษา วิทยาศาสตร์ วิจัยและนวัตกรรม" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+      <TextObject Name="Text3" Top="56.7" Width="718.2" Height="28.35" Text="มหาวิทยาลัยเทคโนโลยีราชมงคลรัตนโกสินทร์" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+      <TableObject Name="Table16" Left="396.9" Top="113.4" Width="160.65" Height="37.8" Border.Lines="All">
+        <TableColumn Name="Column122" Width="75.6"/>
+        <TableColumn Name="Column123" Width="85.05"/>
+        <TableRow Name="Row16" Height="37.8">
+          <TableCell Name="Cell182" Border.Lines="All" Text="จำนวนรายการ" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+          <TableCell Name="Cell183" Border.Lines="All" Text="จำนวนเงิน &#13;&#10;(ล้านบาท)" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+        </TableRow>
+      </TableObject>
+      <TableObject Name="Table17" Left="396.9" Top="85.05" Width="160.65" Height="28.35" Border.Lines="All">
+        <TableColumn Name="Column124" Width="160.65"/>
+        <TableRow Name="Row17" Height="28.35">
+          <TableCell Name="Cell184" Border.Lines="All" Text="คำขอ" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+        </TableRow>
+      </TableObject>
+      <TableObject Name="Table18" Left="557.55" Top="113.4" Width="160.65" Height="37.8" Border.Lines="All">
+        <TableColumn Name="Column125" Width="75.6"/>
+        <TableColumn Name="Column126" Width="85.05"/>
+        <TableRow Name="Row18" Height="37.8">
+          <TableCell Name="Cell185" Border.Lines="All" Text="จำนวนรายการ" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+          <TableCell Name="Cell186" Border.Lines="All" Text="จำนวนเงิน &#13;&#10;(ล้านบาท)" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+        </TableRow>
+      </TableObject>
+      <TableObject Name="Table19" Left="557.55" Top="85.05" Width="160.65" Height="28.35" Border.Lines="All">
+        <TableColumn Name="Column127" Width="160.65"/>
+        <TableRow Name="Row19" Height="28.35">
+          <TableCell Name="Cell187" Border.Lines="All" Text="เสนอตั้ง งปม. [investment_budget_summary.budget_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+        </TableRow>
+      </TableObject>
+    </PageHeaderBand>
+    <DataBand Name="Data1" Top="155.69" Width="718.2">
+      <DataBand Name="Data2" Top="160.19" Width="718.2" Height="37.8" DataSource="data">
+        <TableObject Name="Table21" Width="718.2" Height="37.8" Border.Lines="All">
+          <TableColumn Name="Column134" Width="47.25"/>
+          <TableColumn Name="Column135" Width="349.65"/>
+          <TableColumn Name="Column136" Width="75.6"/>
+          <TableColumn Name="Column137" Width="85.05"/>
+          <TableColumn Name="Column138" Width="75.6"/>
+          <TableColumn Name="Column139" Width="85.05"/>
+          <TableRow Name="Row21" Height="37.8">
+            <TableCell Name="Cell214" Text="[investment_budget_summary.data.row_no]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt">
+              <Highlight>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 1" Fill.Color="214, 220, 228" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 2" Border.Lines="All" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 3" Border.Lines="All" Font="TH SarabunPSK, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+              </Highlight>
+            </TableCell>
+            <TableCell Name="Cell215" Text="[investment_budget_summary.data.topic]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt">
+              <Highlight>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 1" Border.Lines="Right" Fill.Color="214, 220, 228" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 2" Border.Lines="All" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 3" Border.Lines="All" Font="TH SarabunPSK, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+              </Highlight>
+            </TableCell>
+            <TableCell Name="Cell216" Text="[investment_budget_summary.data.request_count_item]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
+              <Formats>
+                <NumberFormat DecimalDigits="0"/>
+                <GeneralFormat/>
+                <GeneralFormat/>
+                <GeneralFormat/>
+              </Formats>
+              <Highlight>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 1" Border.Lines="Right" Fill.Color="214, 220, 228" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 2" Border.Lines="All" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 3" Border.Lines="All" Font="TH SarabunPSK, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+              </Highlight>
+            </TableCell>
+            <TableCell Name="Cell217" Text="[investment_budget_summary.data.request_amount]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
+              <Formats>
+                <NumberFormat DecimalDigits="0"/>
+                <GeneralFormat/>
+                <GeneralFormat/>
+                <GeneralFormat/>
+              </Formats>
+              <Highlight>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 1" Border.Lines="Right" Fill.Color="214, 220, 228" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 2" Border.Lines="All" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 3" Border.Lines="All" Font="TH SarabunPSK, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+              </Highlight>
+            </TableCell>
+            <TableCell Name="Cell218" Text="[investment_budget_summary.data.offer_count_item]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
+              <Formats>
+                <NumberFormat DecimalDigits="0"/>
+                <GeneralFormat/>
+                <GeneralFormat/>
+                <GeneralFormat/>
+              </Formats>
+              <Highlight>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 1" Border.Lines="Right" Fill.Color="214, 220, 228" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 2" Border.Lines="All" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 3" Border.Lines="All" Font="TH SarabunPSK, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+              </Highlight>
+            </TableCell>
+            <TableCell Name="Cell219" Text="[investment_budget_summary.data.offer_amount]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt">
+              <Formats>
+                <NumberFormat DecimalDigits="0"/>
+                <GeneralFormat/>
+                <GeneralFormat/>
+                <GeneralFormat/>
+              </Formats>
+              <Highlight>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 1" Border.Lines="Right" Fill.Color="214, 220, 228" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 2" Border.Lines="All" Font="TH SarabunPSK, 14.25pt, style=Bold" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+                <Condition Expression="[investment_budget_summary.data.topic_type]== 3" Border.Lines="All" Font="TH SarabunPSK, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
+              </Highlight>
+            </TableCell>
+          </TableRow>
+        </TableObject>
+      </DataBand>
+    </DataBand>
+  </ReportPage>
+</Report>