From 7fd7584f3094ddda29f5f66e7b05498c66c81bc7 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Mon, 9 Dec 2024 14:04:09 +0800
Subject: [PATCH] =?UTF-8?q?Offer=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=9A=E5=85=AC=E5=8F=B8=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=EF=BC=88=E4=B8=AD=E8=8B=B1=E6=96=87=EF=BC=89=EF=BC=8C=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E5=8F=82=E6=95=B0=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E5=8F=82=E6=95=B0=E4=B8=AA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Tiobon.Core.Model.xml            |  5 +++++
 .../ViewModels/Extend/CustomFieldView.cs         | 10 ++++++++--
 Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs |  2 +-
 .../Ghrh/Ghrh_TemplateServices.cs                | 16 ++++++++++++----
 Tiobon.Core/Tiobon.Core.Model.xml                |  5 +++++
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index aed56ef7..a3653cca 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -28365,6 +28365,11 @@
             薪资
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.OfferTemplate.AfterSalary">
+            <summary>
+            薪资
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.OfferTemplate.InDate">
             <summary>
             入职日期
diff --git a/Tiobon.Core.Model/ViewModels/Extend/CustomFieldView.cs b/Tiobon.Core.Model/ViewModels/Extend/CustomFieldView.cs
index bf2610c4..4c4eac97 100644
--- a/Tiobon.Core.Model/ViewModels/Extend/CustomFieldView.cs
+++ b/Tiobon.Core.Model/ViewModels/Extend/CustomFieldView.cs
@@ -70,9 +70,15 @@ public class OfferTemplate
     /// <summary>
     /// 薪资
     /// </summary>
-    [Description("薪资")]
+    [Description("试用期薪资")]
     public string Salary { get; set; }
 
+    /// <summary>
+    /// 薪资
+    /// </summary>
+    [Description("薪资")]
+    public string AfterSalary { get; set; }
+
     /// <summary>
     /// 入职日期
     /// </summary>
@@ -81,6 +87,6 @@ public class OfferTemplate
 
     [Description("公司类别")]
     public string CompanyName { get; set; }
-    
+
 
 }
\ No newline at end of file
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index 3b9f5b27..fc7cb3b3 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -2031,7 +2031,7 @@ END";
 
         await LogRecord(order.Id, "变更状态为：已发offer！");
 
-        var content = (await _ghrh_TemplateServices.Preview(id, null)).Data;
+        var content = (await _ghrh_TemplateServices.Preview(id, extFields)).Data;
         #region 发送邮件
         var mailOutbox = new Ghrs_MailOutbox();
         mailOutbox.TOMail = entity.Email;
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_TemplateServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_TemplateServices.cs
index bc38a220..d2754430 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_TemplateServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_TemplateServices.cs
@@ -146,11 +146,19 @@ public class Ghrh_TemplateServices : BaseServices<Ghrh_Template, Ghrh_TemplateDt
                 }
                 #endregion
 
-                #region 薪资
+                #region 试用期薪资
                 if (offerApplyOrder.ProbationSalary.IsNotEmptyOrNull())
                 {
                     result = result.Replace("[Salary_EN]", offerApplyOrder.ProbationSalary.ObjToString());
-                    result = result.Replace("[薪资]", offerApplyOrder.ProbationSalary.ObjToString());
+                    result = result.Replace("[试用期薪资]", offerApplyOrder.ProbationSalary.ObjToString());
+                }
+                #endregion
+
+                #region 薪资
+                if (offerApplyOrder.ProbationSalary.IsNotEmptyOrNull())
+                {
+                    result = result.Replace("[AfterSalary_EN]", offerApplyOrder.ProbationAfterSalary.ObjToString());
+                    result = result.Replace("[薪资]", offerApplyOrder.ProbationAfterSalary.ObjToString());
                 }
                 #endregion
 
@@ -204,11 +212,11 @@ public class Ghrh_TemplateServices : BaseServices<Ghrh_Template, Ghrh_TemplateDt
                 result = result.Replace("[扩展栏位" + i + "]", null);
             }
 
-            StringHelper.GetFieldDesc<OfferTemplate>().Select(o => new ModelTagView2Item { Name = o.Key, Code = o.Key }).ToList()
+            StringHelper.GetFieldDesc<OfferTemplate>().Select(o => new ModelTagView2Item { Name = o.Value, Code = o.Key }).ToList()
                 .ForEach(x =>
                 {
                     result = result.Replace("[" + x.Code + "]", null);
-                    result = result.Replace("[" + x.Code + "_EN]", null);
+                    result = result.Replace("[" + x.Name + "_EN]", null);
                 });
         }
         return await Task.FromResult(ServiceResult<string>.OprateSuccess("查询成功！", result));
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index aed56ef7..a3653cca 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -28365,6 +28365,11 @@
             薪资
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.OfferTemplate.AfterSalary">
+            <summary>
+            薪资
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.OfferTemplate.InDate">
             <summary>
             入职日期