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-04 16:55:05 +07:00
parent 6e389605d9
commit bc55d24121
21 changed files with 224 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Models/RoReport/compensation_head.cs
View File

@@ -11,7 +11,6 @@ namespace rmutr_report.Models.RoThree
public string sector { get; set; }
public decimal? total_amount { get; set; }
public List<compensation_head_detail> data { get; set; }
}
public class compensation_head_detail

12
Models/RoReport/form_1_1.cs
View File

@@ -19,7 +19,9 @@ namespace rmutr_report.Models.RoThree
public string position_name { get; set; }
public Guid? agency_uid { get; set; }
public Guid? budget_plan_uid { get; set; }
public Guid? budget_project_uid { get; set; }
//
public string college_faculty_name_th { get; set; }
public string budget_project_name_th { get; set; }
@@ -34,16 +36,16 @@ namespace rmutr_report.Models.RoThree
public Guid? current_position_uid { get; set; }
public Guid? new_position_uid { get; set; }
public Guid? current_qualification_uid { get; set; }
public Guid? new_qualification_uid { get; set; }
//
public string current_position { get; set; }
public string new_position { get; set; }
public string new_position { get; set; }
public string current_qualification { get; set; }
public string new_qualification { get; set; }
[Column(TypeName ="decimal(18,2)")]
public decimal? current_salary { get; set; }
[Column(TypeName ="decimal(18,2)")]
public decimal? new_salary { get; set; }
[Column(TypeName = "decimal(18,2)")] public decimal? current_salary { get; set; }
[Column(TypeName = "decimal(18,2)")] public decimal? new_salary { get; set; }
public string budget_income_qualification_file_1 { get; set; }
public string budget_income_qualification_file_2 { get; set; }
}

1
Models/RoReport/form_1_2.cs
View File

@@ -54,6 +54,7 @@ namespace rmutr_report.Models.RoThree
public decimal? salary { get; set; }
public string new_position { get; set; }
//
public Guid? budget_project_uid { get; set; }
public Guid? budget_plan_uid { get; set; }

4
Models/RoReport/form_1_3.cs
View File

@@ -55,6 +55,7 @@ namespace rmutr_report.Models.RoThree
//
public string another_document_remark { get; set; }
//
public string budget_year { get; set; }
public string agency_category_name { get; set; }
@@ -129,11 +130,12 @@ namespace rmutr_report.Models.RoThree
//
public int? row { get; set; }
//
public decimal? quantity { get; set; }
public List<t_form_1_3_files> files { get; set; }
}
public class t_form_1_3_files
{
[Key] public Guid? form_1_3_files_uid { get; set; }

144
Models/RoReport/material_education.cs
View File

@@ -10,99 +10,107 @@ namespace rmutr_report.Models.RoThree
public string semester_year_1 { get; set; }
public string semester_year_2 { get; set; }
public string material_semester_year_1 { get; set; }
public string material_semester_year_2 { get; set; }
//
public decimal? semester_year_1_level_1 { get; set; }
public decimal? semester_year_1_level_2 { get; set; }
public decimal? semester_year_1_level_3 { get; set; }
public decimal? semester_year_1_level_4 { get; set; }
public decimal? semester_year_1_level_5 { get; set; }
public decimal? semester_year_1_level_1 { get; set; }
public decimal? semester_year_1_level_2 { get; set; }
public decimal? semester_year_1_level_3 { get; set; }
public decimal? semester_year_1_level_4 { get; set; }
public decimal? semester_year_1_level_5 { get; set; }
public decimal? total_semester_year_level_1 { get; set; }
public decimal? rate_semester_year_level_1 { get; set; }
public decimal? rate_semester_year_level_1 { get; set; }
public decimal? material_amount_1 { get; set; }
//
public decimal? semester_year_2_level_1 { get; set; }
public decimal? semester_year_2_level_2 { get; set; }
public decimal? semester_year_2_level_3 { get; set; }
public decimal? semester_year_2_level_4 { get; set; }
public decimal? semester_year_2_level_5 { get; set; }
public decimal? semester_year_2_level_1 { get; set; }
public decimal? semester_year_2_level_2 { get; set; }
public decimal? semester_year_2_level_3 { get; set; }
public decimal? semester_year_2_level_4 { get; set; }
public decimal? semester_year_2_level_5 { get; set; }
public decimal? total_semester_year_level_2 { get; set; }
public decimal? rate_semester_year_level_2 { get; set; }
public decimal? material_amount_2 { get; set; }
public decimal? total_material { get; set; }
public List<material_education_detail1> data_1 { get; set; }
public decimal? rate_semester_year_level_2 { get; set; }
public decimal? material_amount_2 { get; set; }
public decimal? total_material { get; set; }
public List<material_education_detail1> data_1 { get; set; }
}
public class material_education_detail1
{
public string education_level { get; set; }
public decimal? semester_year_1_level_1 { get; set; }
public decimal? semester_year_1_level_2 { get; set; }
public decimal? semester_year_1_level_3 { get; set; }
public decimal? semester_year_1_level_4 { get; set; }
public decimal? semester_year_1_level_5 { get; set; }
public string education_level { get; set; }
public decimal? semester_year_1_level_1 { get; set; }
public decimal? semester_year_1_level_2 { get; set; }
public decimal? semester_year_1_level_3 { get; set; }
public decimal? semester_year_1_level_4 { get; set; }
public decimal? semester_year_1_level_5 { get; set; }
public decimal? total_semester_year_level_1 { get; set; }
public decimal? rate_semester_year_level_1 { get; set; }
public decimal? material_amount_1 { get; set; }
//
public decimal? semester_year_2_level_1 { get; set; }
public decimal? semester_year_2_level_2 { get; set; }
public decimal? semester_year_2_level_3 { get; set; }
public decimal? semester_year_2_level_4 { get; set; }
public decimal? semester_year_2_level_5 { get; set; }
public decimal? total_semester_year_level_2 { get; set; }
public decimal? rate_semester_year_level_2 { get; set; }
public decimal? material_amount_2 { get; set; }
public decimal? total_material { get; set; }
public List<material_education_detail2> data_2 { get; set; }
public decimal? rate_semester_year_level_1 { get; set; }
public decimal? material_amount_1 { get; set; }
//
public decimal? semester_year_2_level_1 { get; set; }
public decimal? semester_year_2_level_2 { get; set; }
public decimal? semester_year_2_level_3 { get; set; }
public decimal? semester_year_2_level_4 { get; set; }
public decimal? semester_year_2_level_5 { get; set; }
public decimal? total_semester_year_level_2 { get; set; }
public decimal? rate_semester_year_level_2 { get; set; }
public decimal? material_amount_2 { get; set; }
public decimal? total_material { get; set; }
public List<material_education_detail2> data_2 { get; set; }
}
public class material_education_detail2
{
public string curriculum { get; set; }
public decimal? semester_year_1_level_1 { get; set; }
public decimal? semester_year_1_level_2 { get; set; }
public decimal? semester_year_1_level_3 { get; set; }
public decimal? semester_year_1_level_4 { get; set; }
public decimal? semester_year_1_level_5 { get; set; }
public string curriculum { get; set; }
public decimal? semester_year_1_level_1 { get; set; }
public decimal? semester_year_1_level_2 { get; set; }
public decimal? semester_year_1_level_3 { get; set; }
public decimal? semester_year_1_level_4 { get; set; }
public decimal? semester_year_1_level_5 { get; set; }
public decimal? total_semester_year_level_1 { get; set; }
public decimal? rate_semester_year_level_1 { get; set; }
public decimal? material_amount_1 { get; set; }
//
public decimal? semester_year_2_level_1 { get; set; }
public decimal? semester_year_2_level_2 { get; set; }
public decimal? semester_year_2_level_3 { get; set; }
public decimal? semester_year_2_level_4 { get; set; }
public decimal? semester_year_2_level_5 { get; set; }
public decimal? total_semester_year_level_2 { get; set; }
public decimal? rate_semester_year_level_2 { get; set; }
public decimal? material_amount_2 { get; set; }
public decimal? total_material { get; set; }
public List<material_education_detail3> data_3 { get; set; }
public decimal? rate_semester_year_level_1 { get; set; }
public decimal? material_amount_1 { get; set; }
//
public decimal? semester_year_2_level_1 { get; set; }
public decimal? semester_year_2_level_2 { get; set; }
public decimal? semester_year_2_level_3 { get; set; }
public decimal? semester_year_2_level_4 { get; set; }
public decimal? semester_year_2_level_5 { get; set; }
public decimal? total_semester_year_level_2 { get; set; }
public decimal? rate_semester_year_level_2 { get; set; }
public decimal? material_amount_2 { get; set; }
public decimal? total_material { get; set; }
public List<material_education_detail3> data_3 { get; set; }
}
public class material_education_detail3
{
public string major { get; set; }
public decimal? semester_year_1_level_1 { get; set; }
public decimal? semester_year_1_level_2 { get; set; }
public decimal? semester_year_1_level_3 { get; set; }
public decimal? semester_year_1_level_4 { get; set; }
public decimal? semester_year_1_level_5 { get; set; }
public string major { get; set; }
public decimal? semester_year_1_level_1 { get; set; }
public decimal? semester_year_1_level_2 { get; set; }
public decimal? semester_year_1_level_3 { get; set; }
public decimal? semester_year_1_level_4 { get; set; }
public decimal? semester_year_1_level_5 { get; set; }
public decimal? total_semester_year_level_1 { get; set; }
public decimal? rate_semester_year_level_1 { get; set; }
public decimal? rate_semester_year_level_1 { get; set; }
public decimal? material_amount_1 { get; set; }
//
public decimal? semester_year_2_level_1 { get; set; }
public decimal? semester_year_2_level_2 { get; set; }
public decimal? semester_year_2_level_3 { get; set; }
public decimal? semester_year_2_level_4 { get; set; }
public decimal? semester_year_2_level_5 { get; set; }
public decimal? semester_year_2_level_1 { get; set; }
public decimal? semester_year_2_level_2 { get; set; }
public decimal? semester_year_2_level_3 { get; set; }
public decimal? semester_year_2_level_4 { get; set; }
public decimal? semester_year_2_level_5 { get; set; }
public decimal? total_semester_year_level_2 { get; set; }
public decimal? rate_semester_year_level_2 { get; set; }
public decimal? material_amount_2 { get; set; }
public decimal? total_material { get; set; }
public decimal? rate_semester_year_level_2 { get; set; }
public decimal? material_amount_2 { get; set; }
public decimal? total_material { get; set; }
}
}

5
Models/RoReport/material_fuel_lubricant.cs
View File

@@ -8,15 +8,14 @@ namespace rmutr_report.Models.RoThree
public string agency_name_th { get; set; }
public string sector { get; set; }
public decimal? total_amount { get; set; }
public List<material_fuel_lubricant_detail> data { get; set; }
public List<material_fuel_lubricant_detail> data { get; set; }
}
public class material_fuel_lubricant_detail
{
public string type { get; set; }
public decimal? total_amount { get; set; }
public List<material_fuel_lubricant_data_detail> data_detail { get; set; }
public List<material_fuel_lubricant_data_detail> data_detail { get; set; }
}
public class material_fuel_lubricant_data_detail

2
Models/RoReport/material_ro_three.cs
View File

@@ -18,5 +18,5 @@ namespace rmutr_report.Models.RoThree
public decimal? unit_price { get; set; }
public decimal? material_amount { get; set; }
public string remark { get; set; }
}
}
}

13
Models/RoReport/operating_budget_ro_three.cs
View File

@@ -12,8 +12,6 @@ namespace rmutr_report.Models.RoThree
public string disbursement_result_year { get; set; }
public string set_year { get; set; }
public List<operating_budget_ro_three_detail> data_1 { get; set; }
}
public class operating_budget_ro_three_detail
@@ -26,8 +24,7 @@ namespace rmutr_report.Models.RoThree
public decimal? rate { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<operating_budget_ro_three_detail2> data_2{ get; set; }
public List<operating_budget_ro_three_detail2> data_2 { get; set; }
}
public class operating_budget_ro_three_detail2
@@ -41,8 +38,7 @@ namespace rmutr_report.Models.RoThree
public decimal? rate { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<operating_budget_ro_three_detail3> data_3{ get; set; }
public List<operating_budget_ro_three_detail3> data_3 { get; set; }
}
public class operating_budget_ro_three_detail3
@@ -56,8 +52,7 @@ namespace rmutr_report.Models.RoThree
public decimal? rate { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public List<operating_budget_ro_three_detail4> data_4{ get; set; }
public List<operating_budget_ro_three_detail4> data_4 { get; set; }
}
public class operating_budget_ro_three_detail4
@@ -69,6 +64,6 @@ namespace rmutr_report.Models.RoThree
public decimal? quantity_2 { get; set; }
public decimal? rate { get; set; }
public decimal? total_amount { get; set; }
public string remark { get; set; }
public string remark { get; set; }
}
}

17
Models/RoReport/revenue_estimate_education_fee.cs
View File

@@ -8,13 +8,11 @@ namespace rmutr_report.Models.RoThree
public string area { get; set; }
public string faculty { get; set; }
public string semester { get; set; }
public string year { get; set; }
public string budget_project_name_th { get; set; }
public List<revenue_estimate_education_fee_detail1> data_1 { get; set; }
public string side { get; set; }
public decimal? total_revenue { get; set; }
public string year { get; set; }
public string budget_project_name_th { get; set; }
public List<revenue_estimate_education_fee_detail1> data_1 { get; set; }
public string side { get; set; }
public decimal? total_revenue { get; set; }
}
public class revenue_estimate_education_fee_detail1
@@ -22,8 +20,8 @@ public decimal? total_revenue { get; set; }
public string curriculum { get; set; }
public decimal? total_curriculum { get; set; }
public List<revenue_estimate_education_fee_detail2> data_2 { get; set; }
}
public class revenue_estimate_education_fee_detail2
{
public string year_class { get; set; }
@@ -41,9 +39,8 @@ public decimal? total_revenue { get; set; }
public decimal? allocation { get; set; }
public decimal? total_allocation_amount { get; set; }
public List<revenue_estimate_education_fee_detail3> data_3 { get; set; }
}
public class revenue_estimate_education_fee_detail3
{
public string topic_code { get; set; }

6
Models/RoReport/revenue_estimate_income_summary.cs
View File

@@ -10,8 +10,8 @@ namespace rmutr_report.Models.RoThree
public string register_semester_year_1 { get; set; }
public string register_semester_year_2 { get; set; }
public string education_semester_year_1 { get; set; }
public string education_semester_year_2 { get; set; }
public List<revenue_estimate_income_summary_detail> data{ get; set; }
public string education_semester_year_2 { get; set; }
public List<revenue_estimate_income_summary_detail> data { get; set; }
public decimal? sum_1 { get; set; }
public decimal? sum_2 { get; set; }
public decimal? sum_3 { get; set; }
@@ -31,7 +31,6 @@ namespace rmutr_report.Models.RoThree
public string test { get; set; }
public string position_test { get; set; }
public string test_date { get; set; }
}
public class revenue_estimate_income_summary_detail
@@ -50,6 +49,5 @@ namespace rmutr_report.Models.RoThree
public decimal? total_science { get; set; }
public decimal? total_social { get; set; }
public decimal? total_science_social { get; set; }
}
}

12
Models/RoReport/teaching_fee_ro_three.cs
View File

@@ -13,8 +13,9 @@ namespace rmutr_report.Models.RoThree
public string sector_1 { get; set; }
public string disbursement_result_year_1 { get; set; }
public string disbursement_result_semester_1 { get; set; }
public List<teaching_fee_ro_three_data_1> data_1 { get; set; }
//
public decimal? table_1_ba_1 { get; set; }
public decimal? table_1_ma_1 { get; set; }
@@ -25,7 +26,7 @@ namespace rmutr_report.Models.RoThree
public decimal? table_1_teaching_fee_1 { get; set; }
public decimal? table_1_teaching_fee_2 { get; set; }
public decimal? table_1_total { get; set; }
public string budget_year_2 { get; set; }
public string date_range_2 { get; set; }
public string product_2 { get; set; }
@@ -35,7 +36,9 @@ namespace rmutr_report.Models.RoThree
public string sector_2 { get; set; }
public string disbursement_result_year_2 { get; set; }
public string disbursement_result_semester_2 { get; set; }
public List<teaching_fee_ro_three_data_1> data_2 { get; set; }
//
public decimal? table_2_ba_1 { get; set; }
public decimal? table_2_ma_1 { get; set; }
@@ -46,7 +49,7 @@ namespace rmutr_report.Models.RoThree
public decimal? table_2_teaching_fee_1 { get; set; }
public decimal? table_2_teaching_fee_2 { get; set; }
public decimal? table_2_total { get; set; }
public string budget_year_3 { get; set; }
public string date_range_3 { get; set; }
public string product_3 { get; set; }
@@ -56,7 +59,9 @@ namespace rmutr_report.Models.RoThree
public string sector_3 { get; set; }
public string disbursement_result_year_3 { get; set; }
public string disbursement_result_semester_3 { get; set; }
public List<teaching_fee_ro_three_data_1> data_3 { get; set; }
//
public decimal? table_3_ba_1 { get; set; }
public decimal? table_3_ma_1 { get; set; }
@@ -67,7 +72,6 @@ namespace rmutr_report.Models.RoThree
public decimal? table_3_teaching_fee_1 { get; set; }
public decimal? table_3_teaching_fee_2 { get; set; }
public decimal? table_3_total { get; set; }
}
public class teaching_fee_ro_three_data_1