diff --git a/Models/RoReport/form_1_1.cs b/Models/RoReport/form_1_1.cs index bfba110..074d55a 100644 --- a/Models/RoReport/form_1_1.cs +++ b/Models/RoReport/form_1_1.cs @@ -11,6 +11,7 @@ namespace rmutr_report.Models.RoThree public int? budget_income_qualification_no { get; set; } public string qualification_no { get; set; } public DateTime? budget_income_qualification_date { get; set; } + public string budget_income_qualification_dates { get; set; } public string budget_income_qualification_topic { get; set; } public string budget_income_qualification_dear { get; set; } public string first_name { get; set; } @@ -19,27 +20,36 @@ 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; } + public DateTime? budget_project_date { get; set; } + public string day_budget_project { get; set; } + public string month_budget_project { get; set; } + public string year_budget_project { get; set; } public int? budget_project_time_year { get; set; } public int? budget_project_time_month { get; set; } - public Guid? faculty_uid { get; set; } + public string due_to { get; set; } 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 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; } public string budget_income_qualification_file_1 { get; set; } public string budget_income_qualification_file_2 { get; set; } - public string due_to { get; set; } - public int? current_education_level_id { get; set; } - public int? new_education_level_id { get; set; } - public string current_position { get; set; } - public string new_position { get; set; } - public string current_qualification { get; set; } + public string remark { get; set; }//เนื่องจาก - public string new_qualification { get; set; } - public string remark { get; set; } } } \ No newline at end of file