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 @@
薪资
+
+
+ 薪资
+
+
入职日期
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
///
/// 薪资
///
- [Description("薪资")]
+ [Description("试用期薪资")]
public string Salary { get; set; }
+ ///
+ /// 薪资
+ ///
+ [Description("薪资")]
+ public string AfterSalary { get; set; }
+
///
/// 入职日期
///
@@ -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().Select(o => new ModelTagView2Item { Name = o.Key, Code = o.Key }).ToList()
+ StringHelper.GetFieldDesc().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.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 @@
薪资
+
+
+ 薪资
+
+
入职日期