diff --git a/Controllers/RoFive.Controller.cs b/Controllers/RoFive.Controller.cs index 405ff43..e057e99 100644 --- a/Controllers/RoFive.Controller.cs +++ b/Controllers/RoFive.Controller.cs @@ -4400,33 +4400,16 @@ namespace rmutr_report.Controllers public IActionResult GetCooperativeReport([FromRoute] string type, [FromBody] summary_income_cooperative cooperative) { - var sum1 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.revenue_estimates); + /*var sum1 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.revenue_estimates); var sum2 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.deduct_expenses_percent60); var sum3 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.deduct_expenses_percent10); var sum4 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.balance); var sum5 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.deduct_tuition_fees); - var sum6 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.balance_university); + var sum6 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.balance_university);*/ foreach (var detail in cooperative.data) { - if (detail.topic_type == 1) - { - detail.revenue_estimates = sum1; - detail.deduct_expenses_percent60 = sum2; - detail.deduct_expenses_percent10 = sum3; - detail.balance = sum4; - detail.deduct_tuition_fees = sum5; - detail.balance_university = sum6; - } - if (detail.topic_type == 2) - { - detail.revenue_estimates = sum1; - detail.deduct_expenses_percent60 = sum2; - detail.deduct_expenses_percent10 = sum3; - detail.balance = sum4; - detail.deduct_tuition_fees = sum5; - detail.balance_university = sum6; - } + if (detail.topic_type == 4) { string myStr = detail.topic; @@ -4435,12 +4418,7 @@ namespace rmutr_report.Controllers { detail.topic = "รวม "+ projectnames; } - detail.revenue_estimates = sum1; - detail.deduct_expenses_percent60 = sum2; - detail.deduct_expenses_percent10 = sum3; - detail.balance = sum4; - detail.deduct_tuition_fees = sum5; - detail.balance_university = sum6; + } } diff --git a/wwwroot/reports/project_request_thailands.frx b/wwwroot/reports/project_request_thailands.frx index 29d2c4d..0d90015 100644 --- a/wwwroot/reports/project_request_thailands.frx +++ b/wwwroot/reports/project_request_thailands.frx @@ -1,5 +1,5 @@  - + @@ -26,9 +26,9 @@ - - - + + + @@ -994,10 +994,5 @@ - - - - -