kamonwantaengsuk/rmutr_report
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fixed

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-07-13 16:07:12 +07:00
parent 6ac23499d4
commit b18118e309
7 changed files with 264 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
Controllers/Budget.Controller.cs
View File

@@ -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;