diff --git a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs index 434c9ba5..1c9fe392 100644 --- a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs +++ b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs @@ -193,6 +193,7 @@ BEGIN -- order by ISNULL(a.IsDisplay,0) desc,isnull(a.SortNo,b.SortNo) -- 显示的放上面, 不显示的放下面, 再按照序号排序 ORDER BY a.SortNo ASC END"; + string statementRemark = string.Empty; var columns = await _db.Ado.SqlQueryAsync(sql); columns.ForEach(x => { @@ -226,13 +227,13 @@ END"; && o.field != "WorkYears" && o.field != "Age").ToList(); } - if (x.tabKey == "Family") + else if (x.tabKey == "Family") x.children.ForEach(o => { if (o.field == "Gender") o.field = "GenderLabel"; if (o.field == "RelationType") o.field = "RelationTypeLabel"; }); - if (x.tabKey == "Education") + else if (x.tabKey == "Education") x.children.ForEach(o => { if (o.field == "IsGraduate") o.field = "IsGraduateLabel"; @@ -240,19 +241,26 @@ END"; if (o.field == "BeginDate") o.field = "BeginDate1"; if (o.field == "EndDate") o.field = "EndDate1"; }); - if (x.tabKey == "WorkExp" || x.tabKey == "Licence") + else if (x.tabKey == "WorkExp" || x.tabKey == "Licence") x.children.ForEach(o => { if (o.field == "BeginDate") o.field = "BeginDate1"; if (o.field == "EndDate") o.field = "EndDate1"; }); - if (x.tabKey == "Training") + else if (x.tabKey == "Training") x.children.ForEach(o => { if (o.field == "BeginDate") o.field = "BeginDate1"; if (o.field == "EndDate") o.field = "EndDate1"; if (o.field == "IsPass") o.field = "IsPassLabel"; }); + else if (x.tabKey == "Statement") + { + var child = x.children.Where(o => o.field == "StatementRemark").SingleOrDefault(); + if (child != null) + statementRemark = child.placeholder; + x.children = x.children.Where(o => o.field != "StatementRemark").ToList(); + } } x.children1 = null; }); @@ -414,6 +422,17 @@ END"; cssUrl = "http://localhost:9292"; cssUrl += "/css/resume.css"; ViewBag.CssUrl = cssUrl; + ViewBag.StatementRemark = statementRemark.Replace("\\n", "
"); + + var displaySignatureArea = false; + + var config = await _db.Queryable().Where(x => x.ConfigCode == "ESS_Recruit_File_Display_Signature_Area").SingleAsync(); + + if (config != null && config.ConfigValue == "1") + displaySignatureArea = true; + + ViewBag.DisplaySignatureArea = displaySignatureArea; + return View(); } diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 9580e259..7ccb8700 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -8625,6 +8625,16 @@ Offer文件路径 + + + 应聘部门 + + + + + 应聘岗位 + + 教育背景 (Dto.Base) @@ -22116,6 +22126,16 @@ Offer文件路径 + + + 应聘部门 + + + + + 应聘岗位 + + 教育背景 (Model) diff --git a/Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml b/Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml index 5062676f..f1af47ed 100644 --- a/Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml +++ b/Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml @@ -13,6 +13,7 @@ List> LicenceDic = ViewBag.LicenceDic; List> TrainingDic = ViewBag.TrainingDic; Dictionary StatementDic = ViewBag.StatementDic; + bool displaySignatureArea = ViewBag.DisplaySignatureArea; } @@ -261,7 +262,7 @@ @item.tabName } -
员工本人声明(本人填写、提供的资料，是真实的、可靠的。如有虚假，则所签订的劳动合同将自动作废，由此产生的一切后果由本人负责。)
+
@Html.Raw(ViewBag.StatementRemark)
if (item.children != null && item.children.Any()) foreach (var children in item.children) @@ -288,11 +289,14 @@

-
} } + @if (displaySignatureArea) + { +
申请人签名：             日期：
+ } } } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 4703dcd5..d74e5098 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -1,10 +1,7 @@ -using Amazon.Auth.AccessControlPolicy; -using DinkToPdf; +using DinkToPdf; using DinkToPdf.Contracts; -using DnsClient.Protocol; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -using NPOI.HSSF.Record; using System.IO.Compression; using static Tiobon.Core.Model.Consts; @@ -823,7 +820,7 @@ ORDER BY A.SortNo ASC"; dynamic Guide = new ExpandoObject(); dynamic Data = new ExpandoObject(); var entity = await QueryById(id); - + string statementRemark = string.Empty; #region Column string sql = @"DECLARE @ID BIGINT = 1 @@ -996,6 +993,13 @@ END"; editable = "1" }); } + else if (x.tabKey == "Statement") + { + var child = x.children.Where(o => o.field == "StatementRemark").SingleOrDefault(); + if (child != null) + statementRemark = child.placeholder; + x.children = x.children.Where(o => o.field != "StatementRemark").ToList(); + } }); } @@ -1175,6 +1179,9 @@ END"; dynamic StatementRemark = new ExpandoObject(); StatementRemark.Top = "员工本人声明(本人填写、提供的资料，是真实的、可靠的。如有虚假，则所签订的劳动合同将自动作废，由此产生的一切后果由本人负责。)"; + + if (statementRemark.IsNotEmptyOrNull()) + StatementRemark.Top = statementRemark; StatementRemark.CenterPart1 = "根据本人实际情况，在下列"; StatementRemark.CenterPart2 = "中打“√”选择符合项目:"; obj.StatementRemark = StatementRemark; @@ -3415,7 +3422,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status"; #endregion - #region 实话OA同步 + #region 世华OA同步 public async Task Shihua_OA_Sync() { var list = await Db.Queryable().Where(x => x.CreateTime.Value.Date == DateTime.Now).ToListAsync(); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 9580e259..7ccb8700 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -8625,6 +8625,16 @@ Offer文件路径 + + + 应聘部门 + + + + + 应聘岗位 + + 教育背景 (Dto.Base) @@ -22116,6 +22126,16 @@ Offer文件路径 + + + 应聘部门 + + + + + 应聘岗位 + + 教育背景 (Model)