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

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

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-08-22 10:53:06 +07:00
parent 8ade6577aa
commit 48f918060d
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Controllers/Budget.Controller.cs
View File

@@ -2489,9 +2489,8 @@ namespace rmutr_report.Controllers
[FromBody] budget_expenditure_report_from_revenue budget)
{
int no = 1;
var b = budget.budgets.ToArray();
var budgets1 = budget.budgets.ToList();
foreach (var bb in b)
{
bb.personnel_list_s = new List<personnel_list> { bb.personnel_lists };
@@ -2504,10 +2503,12 @@ namespace rmutr_report.Controllers
detail2.text1 = "อัตรา";
}
if (detail.budget_personnel_lists.Count() == 1)
{
detail.budget_personnel_lists[0].topic = "งบบุคลากร";
}
// var cperson = detail.budget_personnel_lists.Count();
//
// if (cperson ==1)
// {
// detail.budget_personnel_lists[0].topic = "งบบุคลากร";
// }
foreach (var detail3 in detail2.budget_personnel_lists_2)
{
@@ -2552,10 +2553,10 @@ namespace rmutr_report.Controllers
no3++;
}
if (detail.budget_personnel_lists.Count() == 2)
{
detail.budget_personnel_lists[0].topic = "งบบุคลากร";
detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
// if (cperson == 2)
// {
// detail.budget_personnel_lists[0].topic = "งบบุคลากร";
// detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
// detail.budget_personnel_lists[1].text1 = null;
// detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null;
// detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null;
@@ -2565,7 +2566,7 @@ namespace rmutr_report.Controllers
// .text1 = null;
// detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
// .details[0].text1 = null;
}
//}
foreach (var detail6 in detail5.details2)
{