fix 外包人员,餐补导入,人员列表

Src/Dlhis.Basic/Organization/Request/GainfoOutEntryRequest.cs

@@ -0,0 +1,119 @@
+using Dlhis.Entity.Basic.Enums;
+using SqlSugar;
+
+namespace Dlhis.Basic.Organization.Request;
+
+public class GainfoOutEntryRequest
+{
+    public long? Id { get; set; }
+
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 证件类型代码
+    /// </summary>
+    public string IdClass { get; set; }
+
+    /// <summary>
+    /// 身份证号
+    /// </summary>
+    public string IdNo { get; set; }
+
+    /// <summary>
+    /// 身份证籍贯区域代码
+    /// </summary>
+    public string Native { get; set; }
+
+    /// <summary>
+    /// 性别 GenderEnumType
+    /// </summary>
+    public GenderEnumType Gender { get; set; }
+
+    /// <summary>
+    /// 生日
+    /// </summary>
+    public DateTime Birthday { get; set; }
+
+    /// <summary>
+    /// 身份证地址
+    /// </summary>
+    public string Address { get; set; }
+
+    /// <summary>
+    /// 部门编码
+    /// </summary>
+    public string DepartmentNo { get; set; }
+
+    /// <summary>
+    /// 民族代码
+    /// </summary>
+    public string Nation { get; set; }
+
+    /// <summary>
+    /// 手机号码
+    /// </summary>
+    public string Phone { get; set; }
+
+    /// <summary>
+    /// 学历
+    /// </summary>
+    public string Degree { get; set; }
+
+    /// <summary>
+    /// 岗位
+    /// </summary>
+    public string PositionNo { get; set; }
+
+    /// <summary>
+    /// 职等
+    /// </summary>
+    public string Grade { get; set; }
+
+    /// <summary>
+    /// 职级
+    /// </summary>
+    public string Title { get; set; }
+
+    /// <summary>
+    /// 卡号
+    /// </summary>
+    public string CardNo { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 人事范围
+    /// </summary>
+    public string Werks { get; set; }
+
+    /// <summary>
+    /// 工作地
+    /// </summary>
+    public string Workplace { get; set; }
+
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    public string Factory { get; set; }
+
+    /// <summary>
+    /// 成本中心
+    /// </summary>
+    public string CostId { get; set; }
+
+    /// <summary>
+    /// 入职日期
+    /// </summary>
+    public DateTime? EntryDate { get; set; }
+
+    /// <summary>
+    /// 离职日期
+    /// </summary>
+    public DateTime? ResignationDate { get; set; }
+}

Src/Dlhis.Basic/Organization/Request/GainfoOutResignRequest.cs

@@ -0,0 +1,23 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.Organization.Request
+{
+    public class GainfoOutResignRequest : IValidatableObject
+    {
+        public long Id { get; set; }
+
+        [Required]
+        public string Reason { get; set; }
+
+        public DateTime Date { get; set; }
+
+        /// <inheritdoc />
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            if (Date < DateTime.Now.Date)
+            {
+                yield return new ValidationResult("离职日期不能小于当前时间", new[] { nameof(Date) });
+            }
+        }
+    }
+}

Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs

@@ -18,6 +18,12 @@ public class GainfoPageRequest : PageDto, IValidatableObject
     /// </summary>
     public List<TenantDepartmentRequest> DepartmentSelections { get; set; } = new List<TenantDepartmentRequest>();
 
+
+    /// <summary>
+    /// 是否为外包
+    /// </summary>
+    public bool? IsOutSource { get; set; }
+
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
         DepartmentSelections.ForEach(d =>