bug fixed

This commit is contained in:
kamonwan taengsuk
2023-05-24 16:24:53 +07:00
parent 1bd56d2269
commit e95a65e016
9 changed files with 3446 additions and 539 deletions

View File

@@ -23,9 +23,12 @@ namespace rmutr_report.Models
public decimal? durable_articles_budget { get; set; }
public List<durable_articles_detail> durable_articles_1 { get; set; }
//public List<receives_data> receive_data { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
//public List<durable_articles_headers> durable_articles_header1 { get; set; }
public string building_year { get; set; }
@@ -41,41 +44,37 @@ namespace rmutr_report.Models
public decimal? research_support_budget { get; set; }
//public string research_support_product { get; set; }
public List<operating_expenses_details> research_support { get; set; }
public List<operating_expenses_details> research_support_1 { get; set; }
public string subsidy_service_year { get; set; }
public decimal? subsidy_service_budget { get; set; }
public List<subsidy_service_headers_detail> subsidy_service { get; set; }
public List<subsidy_service_headers_detail> subsidy_service_1 { get; set; }
public string subsidy_science_year { get; set; }
public decimal? subsidy_science_budget { get; set; }
public List<subsidy_science_headers_detail> subsidy_science { get; set; }
public List<subsidy_science_details> subsidy_science_1 { get; set; }
public string subsidy_society_year { get; set; }
public decimal? subsidy_society_budget { get; set; }
public List<subsidy_science_headers_detail> subsidy_society { get; set; }
public List<subsidy_society_details> subsidy_society_1 { get; set; }
public string subsidy_arts_culture_year { get; set; }
public decimal? subsidy_arts_culture_budget { get; set; }
public List<subsidy_service_headers_detail> subsidy_arts_culture { get; set; }
public List<subsidy_arts_culture_detail> subsidy_arts_culture_1 { get; set; }
public string thailand_year { get; set; }
public decimal? thailand_budget { get; set; }
public List<subsidy_science_headers_detail> thailand { get; set; }
public List<thailand_details> thailand_1 { get; set; }
public string subsidy_budget_project_year { get; set; }
public decimal? subsidy_budget_project_budget { get; set; }
public List<subsidy_service_headers_detail> subsidy_budget_project { get; set; }
public List<subsidy_budget_details> subsidy_budget_project_1 { get; set; }
// public string integrated_plan_name { get; set; }
public string integrated_plan_year { get; set; }
public decimal? integrated_plan_budget { get; set; }
//public List<subsidy_science_headers> integrated_plan_header { get; set; }
//public string strategic_plan_name { get; set; }
public List<integrated_plan_details> integrated_plan_1 { get; set; }
public string strategic_plan_year { get; set; }
public decimal? strategic_plan_budget { get; set; }
//public List<subsidy_science_headers> strategic_plan_header { get; set; }
public List<subsidy_science_headers_detail> integrated_plan { get; set; }
public List<subsidy_science_headers_detail> strategic_plan { get; set; }
public List<strategic_plan_details> strategic_plan_1 { get; set; }
}
public class group_headers2
@@ -140,14 +139,163 @@ namespace rmutr_report.Models
public class operating_expenses_details
{
public string color { get; set; }
public string rowno { get; set; }
public int? color { get; set; }
public string list { get; set; }
public decimal? amount { get; set; }
public decimal? total_amount { get; set; }
public List<operating_expenses_details2> research_support_2 { get; set; }
//public List<operating_expenses_details2> subsidy_science_2 { get; set; }
//public List<operating_expenses_details2> subsidy_society_2 { get; set; }
}
public class operating_expenses_details2
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<operating_expenses_details3> research_support_3 { get; set; }
//public List<operating_expenses_details3> subsidy_science_3 { get; set; }
//public List<operating_expenses_details3> subsidy_society_3 { get; set; }
}
public class operating_expenses_details3
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<operating_expenses_details4> research_support_4 { get; set; }
//public List<operating_expenses_details4> subsidy_science_4 { get; set; }
//public List<operating_expenses_details4> subsidy_society_4 { get; set; }
}
public class operating_expenses_details4
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<operating_expenses_details5> research_support_detail { get; set; }
//public List<operating_expenses_details5> subsidy_science_detail { get; set; }
//public List<operating_expenses_details5> subsidy_society_detail { get; set; }
}
public class operating_expenses_details5
{
public string list { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<operating_expenses_details6> research_support_detail_2 { get; set; }
//public List<operating_expenses_details_6> subsidy_science_detail_2 { get; set; }
//public List<operating_expenses_details_6> subsidy_society_detail_2 { get; set; }
}
public class operating_expenses_details6
{
public string list { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
}
public class subsidy_science_details
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<subsidy_science_details2> subsidy_science_2 { get; set; }
}
public class subsidy_science_details2
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<subsidy_science_details3> subsidy_science_3 { get; set; }
}
public class subsidy_science_details3
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<subsidy_science_details4> subsidy_science_4 { get; set; }
}
public class subsidy_science_details4
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<subsidy_science_details5> subsidy_science_detail { get; set; }
}
public class subsidy_science_details5
{
public string list { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<subsidy_science_details6> subsidy_science_detail_2 { get; set; }
}
public class subsidy_science_details6
{
public string list { get; set; }
public string unit { get; set; }
public decimal? unit_amount { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
}
public class subsidy_society_details
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<subsidy_society_details2> subsidy_society_2 { get; set; }
}
public class subsidy_society_details2
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<subsidy_society_details3> subsidy_society_3 { get; set; }
}
public class subsidy_society_details3
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<subsidy_society_details4> subsidy_society_4 { get; set; }
}
public class subsidy_society_details4
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<subsidy_society_details5> subsidy_society_detail { get; set; }
}
public class subsidy_society_details5
{
public string list { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<subsidy_society_details6> subsidy_society_detail_2 { get; set; }
}
public class subsidy_society_details6
{
public string list { get; set; }
public string unit { get; set; }
public decimal? unit_amount { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
}
// public class durable_articles_headers
// {
// public string header_name { get; set; }
@@ -218,6 +366,7 @@ namespace rmutr_report.Models
public string type_1 { get; set; }
public string type_2 { get; set; }
public string type_3 { get; set; }
public string remark { get; set; }
//public List<durable_articles_detail5> durable_articles_detail { get; set; }
}
@@ -246,26 +395,28 @@ namespace rmutr_report.Models
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<building_headers2>building_2{ get; set; }
public List<building_headers2> building_2 { get; set; }
}
public class building_headers2{
public class building_headers2
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<building_headers3>building_3{ get; set; }
public List<building_headers3> building_3 { get; set; }
}
public class building_headers3
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
//public List<building_headers4>building_4{ get; set; }
public List<building_headers4_detail1>data_1{ get; set; }
public List<building_headers4_detail2>data_2{ get; set; }
public List<building_headers4_detail3>data_3{ get; set; }
public List<building_headers4_detail1> data_1 { get; set; }
public List<building_headers4_detail2> data_2 { get; set; }
public List<building_headers4_detail3> data_3 { get; set; }
}
// public class building_headers4
@@ -281,33 +432,30 @@ namespace rmutr_report.Models
public class building_headers4_detail1
{
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<data_1_details>data_1_detail { get; set; }
public decimal? total_amount { get; set; }
public List<data_1_details> data_1_detail { get; set; }
}
public class data_1_details
{
public string rowno { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
}
public class building_headers4_detail2
{
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<data_1_details>data_2_detail { get; set; }
public decimal? total_amount { get; set; }
public List<data_1_details> data_2_detail { get; set; }
}
public class building_headers4_detail3
{
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<data_3_details>data_3_detail { get; set; }
public decimal? total_amount { get; set; }
public List<data_3_details> data_3_detail { get; set; }
}
public class data_3_details
@@ -326,8 +474,84 @@ public List<data_1_details>data_1_detail { get; set; }
public class subsidy_service_headers_detail
{
public string color { get; set; }
public string rowno { get; set; }
public int? color { get; set; }
//public string rowno { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? amount_6 { get; set; }
public decimal? amount_7 { get; set; }
//public string remark { get; set; }
public List<subsidy_service_headers_detail2> subsidy_service_2 { get; set; }
//public List<subsidy_service_headers_detail2> subsidy_arts_culture_2 { get; set; }
}
public class subsidy_service_headers_detail2
{
public int? color { get; set; }
//public string rowno { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? amount_6 { get; set; }
public decimal? amount_7 { get; set; }
//public string remark { get; set; }
public List<subsidy_service_headers_detail3> subsidy_service_3 { get; set; }
//public List<subsidy_service_headers_detail3> subsidy_arts_culture_3 { get; set; }
}
public class subsidy_service_headers_detail3
{
public int? color { get; set; }
//public string rowno { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? amount_6 { get; set; }
public decimal? amount_7 { get; set; }
//public string remark { get; set; }
public List<subsidy_service_headers_detail4> subsidy_service_4 { get; set; }
//public List<subsidy_service_headers_detail4> subsidy_arts_culture_4 { get; set; }
}
public class subsidy_service_headers_detail4
{
public int? color { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? amount_6 { get; set; }
public decimal? amount_7 { get; set; }
public List<subsidy_service_headers_detail5> subsidy_service_detail { get; set; }
//public List<subsidy_service_headers_detail5> subsidy_arts_culture_detail { get; set; }
}
public class subsidy_service_headers_detail5
{
//public string color { get; set; }
//public string rowno { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
@@ -339,23 +563,295 @@ public List<data_1_details>data_1_detail { get; set; }
public string remark { get; set; }
}
// public class subsidy_science_headers
// {
// public string header_name { get; set; }
// public List<subsidy_science_headers_detail>subsidy_science{ get; set; }
// public List<subsidy_science_headers_detail>subsidy_society{ get; set; }
// public List<subsidy_science_headers_detail>thailand{ get; set; }
//
// }
public class subsidy_science_headers_detail
public class subsidy_arts_culture_detail
{
public int? color { get; set; }
//public string rowno { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? amount_6 { get; set; }
//public decimal? amount_7 { get; set; }
//public string remark { get; set; }
public List<subsidy_arts_culture_detail2> subsidy_arts_culture_2 { get; set; }
}
public class subsidy_arts_culture_detail2
{
public int? color { get; set; }
//public string rowno { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? amount_6 { get; set; }
//public decimal? amount_7 { get; set; }
//public string remark { get; set; }
public List<subsidy_arts_culture_detail3> subsidy_arts_culture_3 { get; set; }
}
public class subsidy_arts_culture_detail3
{
public int? color { get; set; }
//public string rowno { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? amount_6 { get; set; }
//public decimal? amount_7 { get; set; }
//public string remark { get; set; }
public List<subsidy_arts_culture_detail4> subsidy_arts_culture_4 { get; set; }
}
public class subsidy_arts_culture_detail4
{
public int? color { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? amount_6 { get; set; }
//public decimal? amount_7 { get; set; }
public List<subsidy_arts_culture_detail5> subsidy_arts_culture_detail { get; set; }
}
public class subsidy_arts_culture_detail5
{
//public string color { get; set; }
//public string rowno { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? amount_6 { get; set; }
//public decimal? amount_7 { get; set; }
public string remark { get; set; }
}
public class thailand_details
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<thailand_detail2> thailand_2 { get; set; }
}
public class thailand_detail2
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<thailand_detail3> thailand_3 { get; set; }
}
public class thailand_detail3
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<thailand_detail4> thailand_4 { get; set; }
}
public class thailand_detail4
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<thailand_detail5> thailand_detail { get; set; }
}
public class thailand_detail5
{
public string color { get; set; }
public string rowno { get; set; }
public string list { get; set; }
public string unit { get; set; }
public decimal? unit_amount { get; set; }
public decimal? amount { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
}
public class subsidy_budget_details
{
public int? color { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<subsidy_budget_details2> subsidy_budget_project_2 { get; set; }
}
public class subsidy_budget_details2
{
public int? color { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<subsidy_budget_details3> subsidy_budget_project_3 { get; set; }
}
public class subsidy_budget_details3
{
public int? color { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<subsidy_budget_details4> subsidy_budget_project_4 { get; set; }
}
public class subsidy_budget_details4
{
public int? color { get; set; }
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<subsidy_budget_details5> subsidy_budget_project_detail { get; set; }
}
public class subsidy_budget_details5
{
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<subsidy_budget_details6> subsidy_budget_project_detail_2 { get; set; }
}
public class subsidy_budget_details6
{
public string list { get; set; }
public decimal? amount_1 { get; set; }
public decimal? amount_2 { get; set; }
public decimal? amount_3 { get; set; }
public decimal? amount_4 { get; set; }
public decimal? amount_5 { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
}
public class integrated_plan_details
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<integrated_plan_detail2> integrated_plan_2 { get; set; }
}
public class integrated_plan_detail2
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<integrated_plan_detail3> integrated_plan_3 { get; set; }
}
public class integrated_plan_detail3
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<integrated_plan_detail4>integrated_plan_4 { get; set; }
}
public class integrated_plan_detail4
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<integrated_plan_detail5> integrated_plan_detail { get; set; }
}
public class integrated_plan_detail5
{
public string list { get; set; }
public string unit { get; set; }
public decimal? unit_amount { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
}
public class strategic_plan_details
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<strategic_plan_details2> strategic_plan_2 { get; set; }
}
public class strategic_plan_details2
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<strategic_plan_details3> strategic_plan_3 { get; set; }
}
public class strategic_plan_details3
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<strategic_plan_details4> strategic_plan_4 { get; set; }
}
public class strategic_plan_details4
{
public int? color { get; set; }
public string list { get; set; }
public decimal? total_amount { get; set; }
public List<strategic_plan_details5> strategic_plan_detail { get; set; }
}
public class strategic_plan_details5
{
public string list { get; set; }
public string unit { get; set; }
public decimal? unit_amount { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
}
}