From f8871da7b4e2990b5e3a123179f48a910d39721f Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Thu, 28 Dec 2023 17:26:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=85=A5=E8=81=8C?=
 =?UTF-8?q?=E7=A6=BB=E8=81=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MealUser/Request/GainfoAddSaveRequest.cs  |  2 +-
 .../MealUser/Response/GainfoPageResponse.cs   | 29 +++++++++++++++++-
 .../Services/Implements/GainfoService.cs      | 11 +++----
 Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs | 30 +++++++++++++++++--
 4 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/Src/Dlhis.Basic/MealUser/Request/GainfoAddSaveRequest.cs b/Src/Dlhis.Basic/MealUser/Request/GainfoAddSaveRequest.cs
index 8484d7a1..c008dfb7 100644
--- a/Src/Dlhis.Basic/MealUser/Request/GainfoAddSaveRequest.cs
+++ b/Src/Dlhis.Basic/MealUser/Request/GainfoAddSaveRequest.cs
@@ -8,7 +8,7 @@ namespace Dlhis.Basic.MealUser.Request
 {
     public class GainfoAddSaveRequest
     {
-       
+
         public GainfoPageResponse gainfoPageResponse { get; set; }
     }
 }
diff --git a/Src/Dlhis.Basic/MealUser/Response/GainfoPageResponse.cs b/Src/Dlhis.Basic/MealUser/Response/GainfoPageResponse.cs
index f7496625..02c14a8e 100644
--- a/Src/Dlhis.Basic/MealUser/Response/GainfoPageResponse.cs
+++ b/Src/Dlhis.Basic/MealUser/Response/GainfoPageResponse.cs
@@ -8,137 +8,164 @@ namespace Dlhis.Basic.MealUser.Response
         /// 档案号
         /// </summary>
         [SugarColumn(ColumnDescription = "档案号")]
-        public Guid Guestno { get; set; }
+        public string Guestno { get; set; }
+
         /// <summary>
         /// SAP内部编号
         /// </summary>
         [SugarColumn(ColumnDescription = "SAP内部编号")]
         public string Ano { get; set; }
+
         /// <summary>
         /// 人员类型
         /// </summary>
         [SugarColumn(ColumnDescription = "人员类型")]
         public string Class { get; set; }
+
         /// <summary>
         /// 姓名
         /// </summary>
         [SugarColumn(ColumnDescription = "姓名")]
         public string Gname { get; set; }
+
         /// <summary>
         /// 工号
         /// </summary>
         [SugarColumn(ColumnDescription = "工号")]
         public string Ename { get; set; }
+
         /// <summary>
         /// 国家代码
         /// </summary>
         [SugarColumn(ColumnDescription = "国家代码")]
         public string Country { get; set; }
+
         /// <summary>
         /// 证件类型代码
         /// </summary>
         [SugarColumn(ColumnDescription = "证件类型代码")]
         public string Idcls { get; set; }
+
         /// <summary>
         /// 身份证号
         /// </summary>
         [SugarColumn(ColumnDescription = "身份证号")]
         public string IdNO { get; set; }
+
         /// <summary>
         /// 身份证籍贯区域代码
         /// </summary>
         [SugarColumn(ColumnDescription = "身份证籍贯区域代码")]
         public string Native { get; set; }
+
         /// <summary>
         /// 性别
         /// </summary>
         [SugarColumn(ColumnDescription = "性别")]
         public string Sex { get; set; }
+
         /// <summary>
         /// 生日
         /// </summary>
         [SugarColumn(ColumnDescription = "生日")]
         public DateTime Birthday { get; set; }
+
         /// <summary>
         /// 身份证地址
         /// </summary>
         [SugarColumn(ColumnDescription = "身份证地址")]
         public string Address { get; set; }
+
         /// <summary>
         /// 已婚/未婚
         /// </summary>
         [SugarColumn(ColumnDescription = "已婚/未婚")]
         public string Postcode { get; set; }
+
         /// <summary>
         /// 部门编码
         /// </summary>
         [SugarColumn(ColumnDescription = "部门编码")]
         public string Appellation { get; set; }
+
         /// <summary>
         /// 民族代码
         /// </summary>
         [SugarColumn(ColumnDescription = "民族代码")]
         public string Nation { get; set; }
+
         /// <summary>
         /// 手机号码
         /// </summary>
         [SugarColumn(ColumnDescription = "手机号码")]
         public string Phone { get; set; }
+
         /// <summary>
         /// 联系电话
         /// </summary>
         [SugarColumn(ColumnDescription = "联系电话")]
         public string Mobile { get; set; }
+
         /// <summary>
         /// 学历
         /// </summary>
         [SugarColumn(ColumnDescription = "学历")]
         public string Degree { get; set; }
+
         /// <summary>
         /// 岗位
         /// </summary>
         [SugarColumn(ColumnDescription = "岗位")]
         public string Web { get; set; }
+
         /// <summary>
         /// 备注
         /// </summary>
         [SugarColumn(ColumnDescription = "备注")]
         public string Remark { get; set; }
+
         /// <summary>
         /// 操作账号
         /// </summary>
         [SugarColumn(ColumnDescription = "操作账号")]
         public string Log_id { get; set; }
+
         /// <summary>
         /// 操作班次
         /// </summary>
         [SugarColumn(ColumnDescription = "操作班次")]
         public string Log_shift { get; set; }
+
         /// <summary>
         /// 操作时间
         /// </summary>
         [SugarColumn(ColumnDescription = "操作时间")]
         public DateTime Log_date { get; set; }
+
         /// <summary>
         /// 操作IP
         /// </summary>
         [SugarColumn(ColumnDescription = "操作IP")]
         public string Log_ip { get; set; }
+
         /// <summary>
         /// 是否在职 F 在职 T离职
         /// </summary>
         [SugarColumn(ColumnDescription = "是否在职 F 在职 T离职")]
         public string Isowner { get; set; }
+
         /// <summary>
         /// 创建时间
         /// </summary>
         [SugarColumn(ColumnDescription = "创建时间")]
         public DateTime Createdate { get; set; }
+
         /// <summary>
         /// 外文名字
         /// </summary>
         [SugarColumn(ColumnDescription = "外文名字")]
         public string Gname_en { get; set; }
+
         /// <summary>
         /// 卡号
         /// </summary>
diff --git a/Src/Dlhis.Basic/MealUser/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/MealUser/Services/Implements/GainfoService.cs
index 679d99e4..ce6dce37 100644
--- a/Src/Dlhis.Basic/MealUser/Services/Implements/GainfoService.cs
+++ b/Src/Dlhis.Basic/MealUser/Services/Implements/GainfoService.cs
@@ -34,7 +34,7 @@ namespace Dlhis.Basic.MealUser.Services.Implements
 
             var gainfos = new List<GainfoEntity>();
             GainfoEntity aginfoEntity = request.gainfoPageResponse.Adapt<GainfoEntity>();
-            aginfoEntity.Guestno = new Guid("F" + Guid.NewGuid().ToString());
+            aginfoEntity.Guestno = "F" + Guid.NewGuid().ToString();
             gainfos.Add(aginfoEntity);
             await _gainfoStore.InsertAsync(GainfoStatusEnumType.Working, gainfos);
         }
@@ -72,7 +72,7 @@ namespace Dlhis.Basic.MealUser.Services.Implements
         public async Task DimissionAsync(GainfoDImissionRequest request)
         {
             var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working)
-                .Where(x => x.Guestno.ToString() == request.UserId)
+                .Where(x => x.Guestno == request.UserId)
                 .FirstAsync();
             gainfo.ThrowIfNull($"该档案不存在");
             //添加到离职表
@@ -92,7 +92,7 @@ namespace Dlhis.Basic.MealUser.Services.Implements
         public async Task OnboardingAsync(GainfoDImissionRequest request)
         {
             var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.External)
-                .Where(x => x.Guestno.ToString() == request.UserId)
+                .Where(x => x.Guestno == request.UserId)
                 .FirstAsync();
             gainfo.ThrowIfNull($"该档案不存在");
             //添加到正式表
@@ -117,9 +117,6 @@ namespace Dlhis.Basic.MealUser.Services.Implements
             checkGainfoGuestno.ThrowIfTrue($"档案号[{request.gainfoPageResponse.Guestno}]已存在");
         }
 
-        public Task OnboardingAsync(GainfoDImissionRequest request)
-        {
-            throw new NotImplementedException();
-        }
+       
     }
 }
diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
index 15ff34a2..57bbb395 100644
--- a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
@@ -1,5 +1,4 @@
 using SqlSugar;
-using System.Net;
 
 namespace Dlhis.Entity.Basic.Entity;
 
@@ -13,137 +12,164 @@ public class GainfoEntity : SugarBaseEntity
     /// 档案号
     /// </summary>
     [SugarColumn(ColumnDescription = "档案号")]
-    public Guid Guestno { get; set; }
+    public string Guestno { get; set; }
+
     /// <summary>
     /// SAP内部编号
     /// </summary>
     [SugarColumn(ColumnDescription = "SAP内部编号")]
     public string Ano { get; set; }
+
     /// <summary>
     /// 人员类型
     /// </summary>
     [SugarColumn(ColumnDescription = "人员类型")]
     public string Class { get; set; }
+
     /// <summary>
     /// 姓名
     /// </summary>
     [SugarColumn(ColumnDescription = "姓名")]
     public string Gname { get; set; }
+
     /// <summary>
     /// 工号
     /// </summary>
     [SugarColumn(ColumnDescription = "工号")]
     public string Ename { get; set; }
+
     /// <summary>
     /// 国家代码
     /// </summary>
     [SugarColumn(ColumnDescription = "国家代码")]
     public string Country { get; set; }
+
     /// <summary>
     /// 证件类型代码
     /// </summary>
     [SugarColumn(ColumnDescription = "证件类型代码")]
     public string Idcls { get; set; }
+
     /// <summary>
     /// 身份证号
     /// </summary>
     [SugarColumn(ColumnDescription = "身份证号")]
     public string IdNO { get; set; }
+
     /// <summary>
     /// 身份证籍贯区域代码
     /// </summary>
     [SugarColumn(ColumnDescription = "身份证籍贯区域代码")]
     public string Native { get; set; }
+
     /// <summary>
     /// 性别
     /// </summary>
     [SugarColumn(ColumnDescription = "性别")]
     public string Sex { get; set; }
+
     /// <summary>
     /// 生日
     /// </summary>
     [SugarColumn(ColumnDescription = "生日")]
     public DateTime Birthday { get; set; }
+
     /// <summary>
     /// 身份证地址
     /// </summary>
     [SugarColumn(ColumnDescription = "身份证地址")]
     public string Address { get; set; }
+
     /// <summary>
     /// 已婚/未婚
     /// </summary>
     [SugarColumn(ColumnDescription = "已婚/未婚")]
     public string Postcode { get; set; }
+
     /// <summary>
     /// 部门编码
     /// </summary>
     [SugarColumn(ColumnDescription = "部门编码")]
     public string Appellation { get; set; }
+
     /// <summary>
     /// 民族代码
     /// </summary>
     [SugarColumn(ColumnDescription = "民族代码")]
     public string Nation { get; set; }
+
     /// <summary>
     /// 手机号码
     /// </summary>
     [SugarColumn(ColumnDescription = "手机号码")]
     public string Phone { get; set; }
+
     /// <summary>
     /// 联系电话
     /// </summary>
     [SugarColumn(ColumnDescription = "联系电话")]
     public string Mobile { get; set; }
+
     /// <summary>
     /// 学历
     /// </summary>
     [SugarColumn(ColumnDescription = "学历")]
     public string Degree { get; set; }
+
     /// <summary>
     /// 岗位
     /// </summary>
     [SugarColumn(ColumnDescription = "岗位")]
     public string Web { get; set; }
+
     /// <summary>
     /// 备注
     /// </summary>
     [SugarColumn(ColumnDescription = "备注")]
     public string Remark { get; set; }
+
     /// <summary>
     /// 操作账号
     /// </summary>
     [SugarColumn(ColumnDescription = "操作账号")]
     public string Log_id { get; set; }
+
     /// <summary>
     /// 操作班次
     /// </summary>
     [SugarColumn(ColumnDescription = "操作班次")]
     public string Log_shift { get; set; }
+
     /// <summary>
     /// 操作时间
     /// </summary>
     [SugarColumn(ColumnDescription = "操作时间")]
     public DateTime Log_date { get; set; }
+
     /// <summary>
     /// 操作IP
     /// </summary>
     [SugarColumn(ColumnDescription = "操作IP")]
     public string Log_ip { get; set; }
+
     /// <summary>
     /// 是否在职 F 在职 T离职
     /// </summary>
     [SugarColumn(ColumnDescription = "是否在职 F 在职 T离职")]
     public string Isowner { get; set; }
+
     /// <summary>
     /// 创建时间
     /// </summary>
     [SugarColumn(ColumnDescription = "创建时间")]
     public DateTime Createdate { get; set; }
+
     /// <summary>
     /// 外文名字
     /// </summary>
     [SugarColumn(ColumnDescription = "外文名字")]
     public string Gname_en { get; set; }
+
     /// <summary>
     /// 卡号
     /// </summary>