bug fixed
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
kamonwan taengsuk
2023-10-10 17:32:01 +07:00
parent dc23d87855
commit 7b946457ee
2 changed files with 8 additions and 35 deletions

View File

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