优化

Tiobon.Core.Api/Tiobon.Core.Model.xml

@@ -7637,7 +7637,7 @@
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.RegisteredAddress">
             <summary>
-            家庭住址
+            家庭地址(身份证)
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.NowAddress">
@@ -7835,6 +7835,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.IsSyncToStaff">
+            <summary>
+            是否同步至人事资料
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.SpecialDiet">
+            <summary>
+            特殊饮食
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBGBase">
             <summary>
             教育背景 (Dto.Base)
@@ -19768,7 +19778,7 @@
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.RegisteredAddress">
             <summary>
-            家庭住址
+            家庭地址(身份证)
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.NowAddress">
@@ -19966,6 +19976,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.IsSyncToStaff">
+            <summary>
+            是否同步至人事资料
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.SpecialDiet">
+            <summary>
+            特殊饮食
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBG">
             <summary>
             教育背景 (Model)
@@ -25152,6 +25172,11 @@
             审批类型，线上审批or不走审批
             </summary> 
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.OfferApplyExist">
+            <summary>
+            审批单是否存在
+            </summary> 
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.TransferStaffType">
             <summary>
             已报到转入人事资料类型，Fast,快速入职;Normal,正常入职

Tiobon.Core.Model/Base/Ghrh/Ghrh_Resume.Dto.Base.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/11/26 12:41:03  SimonHsiao   初版
+*V0.01  2024/12/6 12:45:01  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -222,9 +222,9 @@ public class Ghrh_ResumeBase
     public string IDCardOrg { get; set; }
 
     /// <summary>
-    /// 家庭住址
+    /// 家庭地址(身份证)
     /// </summary>
-    [Display(Name = "RegisteredAddress"), Description("家庭住址"), MaxLength(256, ErrorMessage = "家庭住址 不能超过 256 个字符")]
+    [Display(Name = "RegisteredAddress"), Description("家庭地址(身份证)"), MaxLength(256, ErrorMessage = "家庭地址(身份证) 不能超过 256 个字符")]
     public string RegisteredAddress { get; set; }
 
     /// <summary>
@@ -450,4 +450,15 @@ public class Ghrh_ResumeBase
     /// 预留字段12
     /// </summary>
     public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 是否同步至人事资料
+    /// </summary>
+    public bool? IsSyncToStaff { get; set; }
+
+    /// <summary>
+    /// 特殊饮食
+    /// </summary>
+    [Display(Name = "SpecialDiet"), Description("特殊饮食"), MaxLength(256, ErrorMessage = "特殊饮食 不能超过 256 个字符")]
+    public string SpecialDiet { get; set; }
 }

Tiobon.Core.Model/Models/Ghrh/Ghrh_Resume.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/11/26 12:41:03  SimonHsiao   初版
+*V0.01  2024/12/6 12:45:01  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -223,9 +223,9 @@ public class Ghrh_Resume : BasePoco
     public string IDCardOrg { get; set; }
 
     /// <summary>
-    /// 家庭住址
+    /// 家庭地址(身份证)
     /// </summary>
-    [Display(Name = "RegisteredAddress"), Description("家庭住址"), MaxLength(256, ErrorMessage = "家庭住址 不能超过 256 个字符")]
+    [Display(Name = "RegisteredAddress"), Description("家庭地址(身份证)"), MaxLength(256, ErrorMessage = "家庭地址(身份证) 不能超过 256 个字符")]
     public string RegisteredAddress { get; set; }
 
     /// <summary>
@@ -451,4 +451,15 @@ public class Ghrh_Resume : BasePoco
     /// 预留字段12
     /// </summary>
     public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 是否同步至人事资料
+    /// </summary>
+    public bool? IsSyncToStaff { get; set; }
+
+    /// <summary>
+    /// 特殊饮食
+    /// </summary>
+    [Display(Name = "SpecialDiet"), Description("特殊饮食"), MaxLength(256, ErrorMessage = "特殊饮食 不能超过 256 个字符")]
+    public string SpecialDiet { get; set; }
 }

Tiobon.Core.Model/View/Ghrh/Ghrh_Resume.Dto.View.cs

@@ -232,11 +232,16 @@ public class Ghrh_ResumeDto : Ghrh_Resume
     /// </summary> 
     public string OfferApplyType { get; set; }
 
+    /// <summary>
+    /// 审批单是否存在
+    /// </summary> 
+    public bool OfferApplyExist { get; set; } = false;
+
     /// <summary>
     /// 已报到转入人事资料类型，Fast,快速入职;Normal,正常入职
     /// </summary>
     public string TransferStaffType { get; set; }
 
 
-    
+
 }

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -3,6 +3,7 @@ using DinkToPdf.Contracts;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
+using NPOI.OpenXmlFormats.Dml;
 using System.IO.Compression;
 using static Tiobon.Core.Model.Consts;
 
@@ -292,6 +293,8 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
         var offerApplyConfig = await Db.Queryable<Ghrh_Config>().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Offer_Apply").FirstAsync();
         //【简历库-录用-已发offer】配置按钮
         var sendOfferConfig = await Db.Queryable<Ghrh_Config>().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Transfer_Staff").FirstAsync();
+
+        var applyOrders = await Db.Queryable<Ghrh_OfferApplyOrder>().Where(x => x.ResumeId != null && ids.Contains(x.ResumeId.Value)).ToListAsync();
         #endregion
 
         list.ForEach(async x =>
@@ -345,6 +348,9 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins
                 {
                     //x.InterviewResult = "推荐中";
                     x.OfferApplyType = offerApplyConfig?.ConfigValue ?? "System";
+
+                    if (applyOrders.Any(x => x.ResumeId == x.ResumeId))
+                        x.OfferApplyExist = true;
                 }
                 if (x.Status == DIC_INTERVIEW_ORDER_STATUS.HasSendOffer)
                 {
@@ -2994,13 +3000,20 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status";
     /// </summary>
     /// <param name="resumeId"></param>
     /// <returns></returns>
-    public async Task SyncToStaff(long resumeId)
+    public async Task<bool> SyncToStaff(long id)
     {
+
+        var entity = await base.QueryById(id);
+        if (entity.IsSyncToStaff == true)
+        {
+            return false;
+        }
         //【简历库-录用-已发offer】配置按钮
         var sendOfferConfig = await Db.Queryable<Ghrh_Config>().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Transfer_Staff").FirstAsync();
 
         var type = sendOfferConfig?.ConfigValue ?? "Fast";
-        var entity = await base.QueryById(resumeId);
+
+        #region 人事资料
         var staff = new Ghra_Staff();
         staff.StaffName = entity.StaffName;
         var aaa = entity.StaffName.GetTotalPingYin();
@@ -3017,7 +3030,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status";
         staff.Mobile = entity.Mobile;
         staff.Email = entity.Email;
         staff.Indate = DateTime.Now;
-        //staff.CertificateType = entity.CertificateType;
+        staff.Reverse3 = entity.CertificateType;
         staff.IDCardBegin = entity.IDCardBegin;
         staff.IDCardEnd = entity.IDCardEnd;
         staff.IdCardNo = entity.IdCardNo;
@@ -3049,8 +3062,35 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status";
         }
         else
             staff.IsEnable = 1;
+        #endregion
 
-        var applyOrder = await Db.Queryable<Ghrh_OfferApplyOrder>().Where(x => x.ResumeId == resumeId).FirstAsync();
+        #region 家庭关系 
+        var familys = await _ghrh_ResumeHomeServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);
+         
+        #endregion
+
+        #region 教育背景 
+         var educations = await _ghrh_ResumeEduBGServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);
+        
+        #endregion 
+
+        #region 工作经历 
+        var workExps = await _ghrh_ResumeWorkExpServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);
+        
+        #endregion
+
+        #region 证件 
+        var Licences = await _ghrh_ResumeLicenceServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);
+       
+        #endregion
+
+        #region 简历培训记录  
+        var Trainings = await _ghrh_ResumeTrainingServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);
+        
+         
+        #endregion
+
+        var applyOrder = await Db.Queryable<Ghrh_OfferApplyOrder>().Where(x => x.ResumeId == id).FirstAsync();
         if (applyOrder != null)
         {
             staff.DeptID = applyOrder.DeptId;
@@ -3060,6 +3100,13 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status";
         }
         var staffId = await Db.Insertable(staff).ExecuteReturnIdentityAsync();
 
+        if (staffId > 0)
+        {
+            entity.IsSyncToStaff = true;
+            await Update(entity, ["IsSyncToStaff"]);
+        }
+        return true;
+
     }
     #endregion
 }

Tiobon.Core/Tiobon.Core.Model.xml

@@ -7637,7 +7637,7 @@
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.RegisteredAddress">
             <summary>
-            家庭住址
+            家庭地址(身份证)
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.NowAddress">
@@ -7835,6 +7835,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.IsSyncToStaff">
+            <summary>
+            是否同步至人事资料
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeBase.SpecialDiet">
+            <summary>
+            特殊饮食
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBGBase">
             <summary>
             教育背景 (Dto.Base)
@@ -19768,7 +19778,7 @@
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.RegisteredAddress">
             <summary>
-            家庭住址
+            家庭地址(身份证)
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.NowAddress">
@@ -19966,6 +19976,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.IsSyncToStaff">
+            <summary>
+            是否同步至人事资料
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_Resume.SpecialDiet">
+            <summary>
+            特殊饮食
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_ResumeEduBG">
             <summary>
             教育背景 (Model)
@@ -25152,6 +25172,11 @@
             审批类型，线上审批or不走审批
             </summary> 
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.OfferApplyExist">
+            <summary>
+            审批单是否存在
+            </summary> 
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeDto.TransferStaffType">
             <summary>
             已报到转入人事资料类型，Fast,快速入职;Normal,正常入职