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

bug 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 12:27:04 +07:00
parent 80bbf8ca17
commit edf731702c
7 changed files with 57 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Controllers/Budget.Controller.cs
View File

@@ -2489,7 +2489,7 @@ namespace rmutr_report.Controllers
[FromBody] budget_expenditure_report_from_revenue budget)
{
int no = 1;
var b = budget.budgets.ToArray();
foreach (var bb in b)
{
@@ -2504,8 +2504,8 @@ namespace rmutr_report.Controllers
}
var cperson = detail.budget_personnel_lists.Count();
if (cperson ==1)
if (cperson == 1)
{
detail.budget_personnel_lists[0].topic = "งบบุคลากร";
}
@@ -2553,22 +2553,6 @@ namespace rmutr_report.Controllers
no3++;
}
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;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.row_no = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.details[0].text1 = null;
}
if (detail5.details2 != null)
{
foreach (var detail6 in detail5.details2)
@@ -2581,10 +2565,48 @@ namespace rmutr_report.Controllers
}
}
}
if (detail5.details2.Any())
{
if (detail5.details2==null)
{
foreach (var detail6 in detail5.details2)
{
detail6.topic = null;
detail6.total = null;
detail6.row_no = null;
detail6.text1 = null;
}
}
}
else
{
detail5.details2.Add(new details2()
{
topic = "",total = 999999999
});
}
}
}
}
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;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.row_no = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.details[0].text1 = null;
}
}
}
}