合并最新

SGGL/Model/APIItem/HSSE/PersonItem.cs

@@ -30,12 +30,16 @@ namespace Model
         /// <summary>
         /// 身份证号码
         /// </summary>
-        public string IdentityCard { get; set; }
+        public string IdentityCard { get; set; }       
         /// <summary>
         /// 地址
         /// </summary>
         public string Address { get; set; }
         /// <summary>
+        /// 生日
+        /// </summary>
+        public DateTime? Birthday { get; set; }
+        /// <summary>
         /// 项目id
         /// </summary>
         public string ProjectId { get; set; }
@@ -48,6 +52,10 @@ namespace Model
         /// </summary>
         public string ProjectName { get; set; }
         /// <summary>
+        /// 单位 统一社会信用代码
+        /// </summary>
+        public string CollCropCode { get; set; }
+        /// <summary>
         /// 单位ID
         /// </summary>
         public string UnitId { get; set; }
@@ -66,7 +74,7 @@ namespace Model
         /// <summary>
         /// 班组名称
         /// </summary>
-        public string TeamGroupName { get; set; }    
+        public string TeamGroupName { get; set; }
         /// <summary>
         /// 岗位ID
         /// </summary>
@@ -76,6 +84,14 @@ namespace Model
         /// </summary>
         public string WorkPostName { get; set; }
         /// <summary>
+        /// 部门ID
+        /// </summary>
+        public string DepartId { get; set; }
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DepartName { get; set; }
+        /// <summary>
         /// 入场时间
         /// </summary>
         public string InTime { get; set; }
@@ -90,15 +106,15 @@ namespace Model
         /// <summary>
         /// 电话
         /// </summary>
-        public string Telephone { get; set; }        
+        public string Telephone { get; set; }
         /// <summary>
         /// 照片路径
         /// </summary>
-        public string PhotoUrl { get; set; }            
+        public string PhotoUrl { get; set; }
         /// <summary>
-        /// 部门名称
+        /// 照片二进制
         /// </summary>
-        public string DepartName { get; set; }
+        public string headImage { get; set; } 
         /// <summary>
         /// 是否启用
         /// </summary>
@@ -384,5 +400,29 @@ namespace Model
             get;
             set;
         }
+        /// <summary>
+        /// 培训类型-查询
+        /// </summary>
+        public string TrainTypeId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  查询-查询字符串
+        /// </summary>
+        public string strParam
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 培训类型-查询
+        /// </summary>
+        public int PageIndex
+        {
+            get;
+            set;
+        } = 0;
     }
 }

SGGL/Model/APIItem/HSSE/TestPlanItem.cs

@@ -179,6 +179,24 @@ namespace Model
             get;
             set;
         }
+
+        /// <summary>
+        /// 考试部门ID
+        /// </summary>
+        public string DepartIds
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 考试部门名称
+        /// </summary>
+        public string DepartNames
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// 考试二维码
         /// </summary>

SGGL/Model/APIItem/HSSE/TrainingPlanItem.cs

@@ -161,6 +161,22 @@ namespace Model
             set;
         }
         /// <summary>
+        /// 培训部门ID
+        /// </summary>
+        public string DepartIds
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 培训部门
+        /// </summary>
+        public string DepartNames
+        {
+            get;
+            set;
+        }
+        /// <summary>
         /// 培训岗位ID
         /// </summary>
         public string WorkPostId