add report พนง.ราชการ

Models/Personnel/personnel_salary_permanent.cs

@@ -1,47 +1,77 @@
+using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace rmutr_report.Models.Personnel
 {
     public class personnel_salary_permanent_root
     {
-        public int? total_salary { get; set; }
+        [Key]
-        public int? total_estimate_salary { get; set; }
+        public Guid? personnel_salary_permanent_root_uid { get; set; }
-        public int? total_promote { get; set; }
+        public Guid? log_report_uid { get; set; }
+        public string year { get; set; }
+        public string salary_text_1 { get; set; }
+        public string salary_text_2 { get; set; }
+        public string salary_text_3 { get; set; }
+        public int? salary { get; set; } 
+        public int? estimate_promote_1 { get; set; }
+        public int? estimate_promote_2 { get; set; }
+        public int? estimate_promote_3 { get; set; }
+        public int? estimate_promote_4 { get; set; }
+        public int? salary_next_year_12 { get; set; } 
+        public int? retiree { get; set; }  
+        public int? salary_per_month { get; set; }
+        public int? salary_per_month_12 { get; set; } 
+        public int? retirement_salary_per_year { get; set; }
+        public int? special_compensation { get; set; }
+        public int? special_compensation_12 { get; set; }
+        public int? full_salary { get; set; }
+        public int? special_compensation_1 { get; set; }
+        public int? special_compensation_2 { get; set; }
+        public int? special_compensation_3 { get; set; }
+        public string other { get; set; }
+        public string other_price { get; set; }
         public int? total { get; set; } 
-        public int? total_salary_12 { get; set; }
+        public int? total_wages_and_fittings { get; set; }
-        public int? total_social_security { get; set; }
+        public int? total_wages_and_fittings_12 { get; set; }  
-        public int? total_social_security_12 { get; set; }
+        public List<t_personnel_salary_permanent> personnel_salary_permanent { get; set; } 
-        public int? total_social_compensation { get; set; }
-        public int? total_social_compensation_12 { get; set; }
-        public int? total_another2 { get; set; }
-        public int? total_quantity_money { get; set; }
-        public int? total2 { get; set; }
-        public int? including_salary_and_fittings { get; set; }
-        public int? including_salary_and_fittings_12 { get; set; }
-        public List<personnel_salary_permanent> personnel_salary_permanent { get; set; } 
     }
-    public class personnel_salary_permanent
+    public class t_personnel_salary_permanent
     {
+        [Key]
+        public Guid? personnel_salary_permanent_uid { get; set; }
+        public Guid? personnel_salary_permanent_root_uid { get; set; }
         public string agency_category_name { get; set; }
-        public int? total_estimate_salary { get; set; }
+        public int? salary { get; set; } 
-        public int? total_promote { get; set; }
+        public int? estimate_promote_1 { get; set; }
+        public int? estimate_promote_2 { get; set; }
+        public int? estimate_promote_3 { get; set; }
+        public int? estimate_promote_4 { get; set; }
+        public int? salary_next_year_12 { get; set; } 
+        public int? retiree { get; set; }  
+        public int? salary_per_month { get; set; }
+        public int? salary_per_month_12 { get; set; } 
+        public int? retirement_salary_per_year { get; set; }
+        public int? special_compensation { get; set; }
+        public int? special_compensation_12 { get; set; }
+        public int? full_salary { get; set; }
+        public int? special_compensation_1 { get; set; }
+        public int? special_compensation_2 { get; set; }
+        public int? special_compensation_3 { get; set; }
+        public string other { get; set; }
+        public string other_price { get; set; }
         public int? total { get; set; } 
-        public int? total_salary_12 { get; set; }
+        public int? total_wages_and_fittings { get; set; }
-        public int? total_social_security { get; set; }
+        public int? total_wages_and_fittings_12 { get; set; }
-        public int? total_social_security_12 { get; set; }
+        public List<t_personnel_salary_permanent_deltail> personnel_salary_deltails { get; set; }
-        public int? total_social_compensation { get; set; }
-        public int? total_social_compensation_12 { get; set; }
-        public int? total_another2 { get; set; }
-        public int? total_quantity_money { get; set; }
-        public int? total2 { get; set; }
-        public int? including_salary_and_fittings { get; set; }
-        public int? including_salary_and_fittings_12 { get; set; }
-        public List<personnel_salary_deltail> personnel_salary_deltails { get; set; }
     }
 
-    public class personnel_salary_deltail
+    public class t_personnel_salary_permanent_deltail
     {
-        public bool? is_color { get; set; }
+        //public bool? is_color { get; set; }
+        [Key]
+        public Guid? personnel_salary_permanent_detail_uid { get; set; }
+        public Guid? personnel_salary_permanent_uid { get; set; }
         public string manpower { get; set; }
         public string full_name { get; set; }
         public string first_name_th { get; set; }
@@ -50,18 +80,25 @@ namespace rmutr_report.Models.Personnel
         public string parent_agency_name { get; set; }
         public string area { get; set; }
         public int? salary { get; set; } 
-        public int? estimate_salary { get; set; }
+        public int? estimate_promote_1 { get; set; }
-        public int? promote { get; set; }
+        public int? estimate_promote_2 { get; set; }
+        public int? estimate_promote_3 { get; set; }
+        public int? estimate_promote_4 { get; set; }
+        public int? salary_next_year_12 { get; set; } 
+        public int? retiree { get; set; }  
+        public int? salary_per_month { get; set; }
+        public int? salary_per_month_12 { get; set; } 
+        public int? retirement_salary_per_year { get; set; }
+        public int? special_compensation { get; set; }
+        public int? special_compensation_12 { get; set; }
+        public int? full_salary { get; set; }
+        public int? special_compensation_1 { get; set; }
+        public int? special_compensation_2 { get; set; }
+        public int? special_compensation_3 { get; set; }
+        public string other { get; set; }
+        public string other_price { get; set; }
         public int? total { get; set; } 
-        public int? salary_12 { get; set; }
+        public int? total_wages_and_fittings { get; set; }
-        public int? social_security { get; set; }
+        public int? total_wages_and_fittings_12 { get; set; }
-        public int? social_security_12 { get; set; }
-        public int? social_compensation { get; set; }
-        public int? social_compensation_12 { get; set; }
-        public int? another2 { get; set; }
-        public int? quantity_money { get; set; }
-        public int? total2 { get; set; }
-        public int? including_salary_and_fittings { get; set; }
-        public int? including_salary_and_fittings_12 { get; set; }
     }
 }

obj/rider.project.restore.info

@@ -1 +1 @@
-16800008301171379
+16801461433146553