diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index d5189d6..9b32ad6 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -1598,11 +1598,11 @@ namespace rmutr_report.Controllers public IActionResult GetBudgetReport([FromRoute] string type, [FromBody] budget_expenditure_from_revenue budget_expenditure_from_revenues) { - var topic2 = budget_expenditure_from_revenues.budget_expenditure_from_revenue_details.ToArray() - .Where(i => i.topic_type == 2).ToList(); - var topic3 = budget_expenditure_from_revenues.budget_expenditure_from_revenue_details.ToArray() - .Where(i => i.topic_type == 3).OrderBy(f=>f.couse_uid).ThenBy(m=>m.major_uid) - .ThenBy(r=>r.row).ToList(); + // var topic2 = budget_expenditure_from_revenues.budget_expenditure_from_revenue_details + // .Where(i => i.topic_type == 2).ToList(); + // var topic3 = budget_expenditure_from_revenues.budget_expenditure_from_revenue_details + // .Where(i => i.topic_type == 3).OrderBy(f=>f.couse_uid).ThenBy(m=>m.major_uid) + // .ThenBy(r=>r.row).ToList(); // var sum_1 = budget_expenditure_from_revenues.budget_expenditure_from_revenue_details // .Where(h => h.topic_type == 2).Sum(j => // j.current_students); @@ -1667,7 +1667,7 @@ namespace rmutr_report.Controllers foreach (var detail in budget_expenditure_from_revenues.budget_expenditure_from_revenue_details) { - if (detail.topic_type == 1 && detail.topic_type != 2&& detail.topic_type != 3) + if (detail.topic_type == 1) { detail.topic_1 = detail.topic; detail.topic_2 = null; @@ -1718,66 +1718,65 @@ namespace rmutr_report.Controllers var sum12 = budget_expenditure_from_revenues.budget_expenditure_from_revenue_details .Where(h => h.topic_type == 1).Sum(j => j.education_fee_less_fee_total); - budget_expenditure_from_revenues.sum_12 = sum12; - - detail.current_students = topic2.Sum(d=>d.current_students); - - detail.students_reduced = topic2.Sum(d=>d.students_reduced); - - detail.students_estimates = topic2.Sum(d=>d.students_estimates); - - detail.price_regis_flat_payment = topic2.Sum(d=>d.price_regis_flat_payment); - - detail.library_total = topic2.Sum(d=>d.library_total); - - detail.utilities_total =topic2.Sum(d=>d.utilities_total); - - detail.student_club_library_total = topic2.Sum(d=>d.student_club_library_total); - - detail.accident_insurance_total = topic2.Sum(d=>d.accident_insurance_total); - - detail.academic_activities_total = topic2.Sum(d=>d.academic_activities_total); - - detail.examination_and_x_rays_total = topic2.Sum(d=>d.examination_and_x_rays_total); - - detail.tuition_fee_total = topic2.Sum(d=>d.tuition_fee_total); - - detail.education_fee_less_fee_total = topic2.Sum(d=>d.education_fee_less_fee_total); + budget_expenditure_from_revenues.sum_12 = sum12; + // detail.current_students = topic3.Sum(d=>d.current_students); + // + // detail.students_reduced = topic3.Sum(d=>d.students_reduced); + // + // detail.students_estimates = topic3.Sum(d=>d.students_estimates); + // + // detail.price_regis_flat_payment = topic3.Sum(d=>d.price_regis_flat_payment); + // + // detail.library_total = topic3.Sum(d=>d.library_total); + // + // detail.utilities_total =topic3.Sum(d=>d.utilities_total); + // + // detail.student_club_library_total = topic3.Sum(d=>d.student_club_library_total); + // + // detail.accident_insurance_total = topic3.Sum(d=>d.accident_insurance_total); + // + // detail.academic_activities_total = topic3.Sum(d=>d.academic_activities_total); + // + // detail.examination_and_x_rays_total = topic3.Sum(d=>d.examination_and_x_rays_total); + // + // detail.tuition_fee_total = topic3.Sum(d=>d.tuition_fee_total); + // + // detail.education_fee_less_fee_total = topic3.Sum(d=>d.education_fee_less_fee_total); } - if (detail.topic_type == 2&& detail.topic_type != 1&& detail.topic_type != 3) + if (detail.topic_type == 2) { detail.topic_1 = detail.topic; detail.topic_2 = null; - detail.current_students = topic3.Sum(d=>d.current_students); + // detail.current_students = topic2.Sum(d=>d.current_students); + // + // detail.students_reduced = topic2.Sum(d=>d.students_reduced); + // + // detail.students_estimates = topic2.Sum(d=>d.students_estimates); + // + // detail.price_regis_flat_payment = topic2.Sum(d=>d.price_regis_flat_payment); + // + // detail.library_total = topic2.Sum(d=>d.library_total); + // + // detail.utilities_total =topic2.Sum(d=>d.utilities_total); + // + // detail.student_club_library_total = topic2.Sum(d=>d.student_club_library_total); + // + // detail.accident_insurance_total = topic2.Sum(d=>d.accident_insurance_total); + // + // detail.academic_activities_total = topic2.Sum(d=>d.academic_activities_total); + // + // detail.examination_and_x_rays_total = topic2.Sum(d=>d.examination_and_x_rays_total); + // + // detail.tuition_fee_total = topic2.Sum(d=>d.tuition_fee_total); + // + // detail.education_fee_less_fee_total = topic2.Sum(d=>d.education_fee_less_fee_total); + } - detail.students_reduced = topic3.Sum(d=>d.students_reduced); - - detail.students_estimates = topic3.Sum(d=>d.students_estimates); - - detail.price_regis_flat_payment = topic3.Sum(d=>d.price_regis_flat_payment); - - detail.library_total = topic3.Sum(d=>d.library_total); - - detail.utilities_total =topic3.Sum(d=>d.utilities_total); - - detail.student_club_library_total = topic3.Sum(d=>d.student_club_library_total); - - detail.accident_insurance_total = topic3.Sum(d=>d.accident_insurance_total); - - detail.academic_activities_total = topic3.Sum(d=>d.academic_activities_total); - - detail.examination_and_x_rays_total = topic3.Sum(d=>d.examination_and_x_rays_total); - - detail.tuition_fee_total = topic3.Sum(d=>d.tuition_fee_total); - - detail.education_fee_less_fee_total = topic3.Sum(d=>d.education_fee_less_fee_total); - } - - if (detail.topic_type == 3&& detail.topic_type != 1&& detail.topic_type != 2) + if (detail.topic_type == 3) { detail.topic_2 = detail.topic; detail.topic_1 = null; diff --git a/Models/budget/budget_expenditure_from_revenue.cs b/Models/budget/budget_expenditure_from_revenue.cs index ab38b1b..8425286 100644 --- a/Models/budget/budget_expenditure_from_revenue.cs +++ b/Models/budget/budget_expenditure_from_revenue.cs @@ -91,6 +91,7 @@ namespace rmutr_report.Models public Guid? academic_year_uid { get; set; } public Guid? couse_uid { get; set; } public Guid? major_uid { get; set; } + //public List budget_expenditure_from_revenue_details_2 { get; set; } } @@ -134,9 +135,10 @@ namespace rmutr_report.Models // // // public int? topic_type { get; set; } + // //public List budget_expenditure_from_revenue_details_3 { get; set; } // // } - // + // public class t_budget_expenditure_from_revenue_detail_3 // { // public string topic { get; set; } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index d83b9ad..fede534 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 c413bb4..3ce5a57 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 d83b9ad..fede534 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 c413bb4..3ce5a57 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_from_revenue.frx b/wwwroot/reports/budget_expenditure_from_revenue.frx index 2db879e..7ecc718 100644 --- a/wwwroot/reports/budget_expenditure_from_revenue.frx +++ b/wwwroot/reports/budget_expenditure_from_revenue.frx @@ -1,5 +1,5 @@  - + @@ -37,7 +37,7 @@ - + @@ -187,212 +187,210 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +