diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 81b83c4..5c093de 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2537,7 +2537,7 @@ namespace rmutr_report.Controllers var budget17 = budget2 + budget5 + budget8 + budget11 + budget14; var budget18 = budget16 + budget17; int row = 1; - int datarow = 1; + //int datarow = 1; foreach (var datas in government_budget.data) { @@ -2572,11 +2572,11 @@ namespace rmutr_report.Controllers government_budget.budget_16 = budget16; government_budget.budget_17 = budget17; government_budget.budget_18 = budget18; - if (datas.topic_type == 2) - { - datas.row_no = datarow.ToString(); - datarow++; - } + // if (datas.topic_type == 2) + // { + // datas.row_no = datarow.ToString(); + // datarow++; + // } } foreach (var notation in government_budget.notations) @@ -2662,23 +2662,7 @@ namespace rmutr_report.Controllers public IActionResult GetBudgetProjectsReport([FromRoute] string type, [FromBody] budget_projects budget) { - foreach (var detail in budget.data) - { - int row = 1; - foreach (var dataDetail in detail.detail) - { - if (dataDetail.topic_type == 5) - { - dataDetail.row_no = row.ToString(); - row++; - } - else - { - dataDetail.row_no = null; - } - } - } - + var budgets = new List() { budget }; Report report = new Report(); @@ -2715,20 +2699,7 @@ namespace rmutr_report.Controllers public IActionResult GetBudgetTotalReport([FromRoute] string type, [FromBody] total_budget budget) { - int row = 1; - foreach (var detail2 in budget.data) - { - if (detail2.topic_type == 5) - { - detail2.row_no = row.ToString(); - row++; - } - else - { - detail2.row_no = null; - } - } - + var summaryBudget = new List() { budget }; Report report = new Report(); diff --git a/wwwroot/reports/summary_government_budget_plan.frx b/wwwroot/reports/summary_government_budget_plan.frx index b2303f3..a64412a 100644 --- a/wwwroot/reports/summary_government_budget_plan.frx +++ b/wwwroot/reports/summary_government_budget_plan.frx @@ -1,5 +1,5 @@  - + @@ -130,7 +130,7 @@ - +