diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 84dc41b..75a6d43 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2322,6 +2322,12 @@ namespace rmutr_report.Controllers public IActionResult GetBudgetExpenditureRevenueReport([FromRoute] string type, [FromBody] budget_expenditure_report_from_revenue budget) { + var b = budget.budgets.ToArray(); + foreach (var bb in b) + { + bb.personnel_list_s = new List { bb.personnel_lists }; + } + var budgetExpenditure = new List() { budget }; Report report = new Report(); diff --git a/Models/budget/budget_expenditure_report_from_revenue.cs b/Models/budget/budget_expenditure_report_from_revenue.cs index 06bcceb..73d7865 100644 --- a/Models/budget/budget_expenditure_report_from_revenue.cs +++ b/Models/budget/budget_expenditure_report_from_revenue.cs @@ -5,7 +5,7 @@ namespace rmutr_report.Models public class budget_expenditure_report_from_revenue { public string academic_year_name_th { get; set; } - //public string start_and_end_date_report { get; set; } + public string sector { get; set; } //ภาค //public string revenue_estimates_type { get; set; } @@ -23,7 +23,8 @@ namespace rmutr_report.Models { public decimal? total { get; set; } //แผนงาน - public List personnel_lists { get; set; } + public personnel_list personnel_lists { get; set; } + public List personnel_list_s { get; set; } } public class personnel_list //รายการบุคลกร @@ -52,15 +53,14 @@ namespace rmutr_report.Models public string topic { get; set; } public decimal? rate { get; set; } public decimal? total { get; set; } - public List details { get; set; } + public List
details { get; set; } } - public class budget_rate_details //อันรองลงมา + public class details //อันรองลงมา { public string position_level { get; set; } public string qualification { get; set; } public decimal? rate { get; set; } public decimal? total { get; set; } - } } \ No newline at end of file diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 7afbd2e..54da702 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 19d715c..acc2313 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/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 7afbd2e..54da702 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 19d715c..acc2313 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue.frx b/wwwroot/reports/budget_expenditure_report_from_revenue.frx index c3124b8..ac74e51 100644 --- a/wwwroot/reports/budget_expenditure_report_from_revenue.frx +++ b/wwwroot/reports/budget_expenditure_report_from_revenue.frx @@ -1,5 +1,5 @@  - + @@ -9,7 +9,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -58,41 +58,41 @@ - + - + - + - + - - + + - + - - + + - + - + - - - + + +