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

fix topic type
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-08-23 15:37:18 +07:00
parent 5d6843f33e
commit a8a3ca622f
16 changed files with 102 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
Controllers/Budget.Controller.cs
View File

@@ -2653,6 +2653,8 @@ namespace rmutr_report.Controllers
int no4 = 1;
int no5 = 1;
int no6 = 1;
int no7 = 1;
int no8 = 1;
var detail = budget.details.ToArray();
foreach (var indetail in detail)
@@ -2662,18 +2664,14 @@ namespace rmutr_report.Controllers
indetail.topic1 = indetail.topic;
indetail.amount1 = indetail.value1;
indetail.text1 = "บาท";
indetail.topic2 = null;
indetail.amount2 = null;
indetail.text2 = null;
}
if (indetail.topic_type==2)
{
indetail.topic2 = indetail.topic;
indetail.amount2 = indetail.value1;
indetail.text2 = "บาท";
indetail.topic1 = null;
indetail.amount1 = null;
indetail.text1 = null;
}
if (indetail.topic_type==3)
{
@@ -2682,28 +2680,9 @@ namespace rmutr_report.Controllers
indetail.amount4 = indetail.value2;
indetail.text3 = "อัตรา";
indetail.text4 = "บาท";
indetail.topic1 = null;
indetail.amount1 = null;
indetail.text1 = null;
indetail.topic2 = null;
indetail.amount2 = null;
indetail.text2 = null;
}
if (indetail.topic_type==3 && indetail.topic=="งบดําเนินงาน")
{
indetail.topic3 = indetail.topic;
//indetail.amount3 = indetail.value1;
indetail.amount4 = indetail.value1;
indetail.text3 = null;
indetail.text4 = "บาท";
indetail.topic1 = null;
indetail.amount1 = null;
indetail.text1 = null;
indetail.topic2 = null;
indetail.amount2 = null;
indetail.amount3 = null;
indetail.text2 = null;
}
if (indetail.topic_type==4)
{
indetail.topic4 = indetail.topic;
@@ -2714,15 +2693,15 @@ namespace rmutr_report.Controllers
indetail.row_no1 = no1;
no1++;
}
if (indetail.topic_type==4&& indetail.topic=="ค่าตอบแทน ค่าใช้สอยและค่าวัสดุ")
{
indetail.row_no1 = null;
indetail.amount6 = indetail.value1;
indetail.text5 = null;
indetail.amount5 =null;
indetail.text6 = "บาท";
}
// if (indetail.topic_type==4&& indetail.topic=="ค่าตอบแทน ค่าใช้สอยและค่าวัสดุ")
// {
//
// indetail.row_no1 = null;
// indetail.amount6 = indetail.value1;
// indetail.text5 = null;
// indetail.amount5 =null;
// indetail.text6 = "บาท";
// }
if (indetail.topic_type==5)
{
indetail.topic5 = indetail.topic;
@@ -2733,16 +2712,16 @@ namespace rmutr_report.Controllers
indetail.row_no2 = no2;
no2++;
}
if (indetail.topic_type==5&& indetail.topic=="ค่าตอบแทน")
{
indetail.topic5 = indetail.topic;
indetail.amount7 = null;
indetail.amount8 = indetail.value1;
indetail.text7 = null;
indetail.text8 = "บาท";
indetail.row_no2 = null;
}
// if (indetail.topic_type==5&& indetail.topic=="ค่าตอบแทน")
// {
//
// indetail.topic5 = indetail.topic;
// indetail.amount7 = null;
// indetail.amount8 = indetail.value1;
// indetail.text7 = null;
// indetail.text8 = "บาท";
// indetail.row_no2 = null;
// }
if (indetail.topic_type==6)
{
indetail.topic9 = indetail.topic;
@@ -2793,6 +2772,37 @@ namespace rmutr_report.Controllers
no6++;
}
if (indetail.topic_type==11)
{
indetail.topic14 = indetail.topic;
indetail.amount16 = indetail.value1;
indetail.text20 = "บาท";
}
if (indetail.topic_type==12)
{
indetail.topic15 = indetail.topic;
indetail.amount17 = indetail.value1;
indetail.text21 = "บาท";
indetail.text22 = ".";
indetail.row_no7 = no7;
no7++;
}
if (indetail.topic_type==13)
{
indetail.topic16 = indetail.topic;
indetail.amount18 = indetail.value1;
indetail.text23 = "บาท";
}
if (indetail.topic_type==14)
{
indetail.topic17 = indetail.topic;
indetail.amount19 = indetail.value1;
indetail.text24 = "บาท";
indetail.row_no8 = no8;
no8++;
}
}
var budgetExpenditure = new List<budget_expenditure_report_from_revenue_v2>() { budget };