diff --git a/Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml b/Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml
index f1af47ed..bbb2da32 100644
--- a/Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml
+++ b/Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml
@@ -84,7 +84,7 @@
{
@if (i > 0)
{
-
+
}
@if (item.children != null && item.children.Any())
{
@@ -124,7 +124,7 @@
{
if (i > 0)
{
-
+
}
if (item.children != null && item.children.Any())
foreach (var children in item.children)
@@ -159,7 +159,7 @@
{
if (i > 0)
{
-
+
}
if (item.children != null && item.children.Any())
foreach (var children in item.children)
@@ -195,7 +195,7 @@
{
if (i > 0)
{
-
+
}
if (item.children != null && item.children.Any())
foreach (var children in item.children)
@@ -230,7 +230,7 @@
{
if (i > 0)
{
-
+
}
if (item.children != null && item.children.Any())
foreach (var children in item.children)
@@ -262,7 +262,7 @@
@item.tabName
}
- @Html.Raw(ViewBag.StatementRemark)
+ @Html.Raw(ViewBag.StatementRemark)
if (item.children != null && item.children.Any())
foreach (var children in item.children)
@@ -295,7 +295,7 @@
}
@if (displaySignatureArea)
{
- 申请人签名： 日期：
+ 申请人签名： 日期：
}
}
diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs
index eddb52cf..9c25d0a6 100644
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@@ -1234,6 +1234,16 @@ public partial class CommonServices : BaseServices>, ICommon
icon = "ess-icon-reject",
position = "left"
});
+ if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeRemind").Any())
+ result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+ {
+ display = true,
+ fnKey = "TBD11YN",
+ fnTitle = "提醒",
+ fnType = "row",
+ icon = "ess-icon-reject",
+ position = "left"
+ });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTag").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
@@ -1284,16 +1294,6 @@ public partial class CommonServices : BaseServices>, ICommon
icon = "ess-icon-reject",
position = "left"
});
- if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeRemind").Any())
- result.JM_PageControlT1.Toolbar.Add(new Toolbar()
- {
- display = true,
- fnKey = "TBD11YN",
- fnTitle = "提醒",
- fnType = "row",
- icon = "ess-icon-reject",
- position = "left"
- });
}
break;
@@ -1308,62 +1308,22 @@ public partial class CommonServices : BaseServices>, ICommon
if (toolbarRoles != null && toolbarRoles.Any())
{
- if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTag").Any())
- result.JM_PageControlT1.Toolbar.Add(new Toolbar()
- {
- display = true,
- fnKey = "TBD6YN",
- fnTitle = "标签",
- fnType = "row",
- icon = "ess-icon-reject",
- position = "left"
- });
- if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeRecycle").Any())
- result.JM_PageControlT1.Toolbar.Add(new Toolbar()
- {
- display = true,
- fnKey = "TBD7YN",
- fnTitle = "回收",
- fnType = "row",
- icon = "ess-icon-reject",
- position = "left"
- });
- if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTalentPool").Any())
- result.JM_PageControlT1.Toolbar.Add(new Toolbar()
- {
- display = true,
- fnKey = "TBD8YN",
- fnTitle = "加入人才库",
- fnType = "row",
- icon = "ess-icon-reject",
- position = "left"
- });
- if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeBlacklist").Any())
- result.JM_PageControlT1.Toolbar.Add(new Toolbar()
- {
- display = true,
- fnKey = "TBD9YN",
- fnTitle = "加入黑名单",
- fnType = "row",
- icon = "ess-icon-reject",
- position = "left"
- });
- if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeDownLoad").Any())
+ if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeProcessRemind").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
display = true,
- fnKey = "TBD10YN",
- fnTitle = "下载",
+ fnKey = "TBD12YN",
+ fnTitle = "提醒",
fnType = "row",
icon = "ess-icon-reject",
position = "left"
});
- if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeProcessRemind").Any())
+ if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeReScheduleInterview").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
display = true,
- fnKey = "TBD12YN",
- fnTitle = "提醒",
+ fnKey = "TBD5YN",
+ fnTitle = "重新推荐",
fnType = "row",
icon = "ess-icon-reject",
position = "left"
@@ -1389,16 +1349,6 @@ public partial class CommonServices : BaseServices>, ICommon
position = "left"
});
}
- if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeReScheduleInterview").Any())
- result.JM_PageControlT1.Toolbar.Add(new Toolbar()
- {
- display = true,
- fnKey = "TBD5YN",
- fnTitle = "重新推荐",
- fnType = "row",
- icon = "ess-icon-reject",
- position = "left"
- });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeApplyOffer").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
@@ -1418,19 +1368,6 @@ public partial class CommonServices : BaseServices>, ICommon
icon = "ess-icon-reject",
position = "left"
});
- }
- break;
- case "F_ResumeMaintenance_Hire"://录用
- sql = $@"SELECT A.RoleId, B.RoleNo, B.RoleName
- FROM Ghrs_UserRole A LEFT JOIN Ghrs_Role B ON A.RoleId = B.RoleId
- WHERE A.UserID = {App.User.ID}
- AND A.IsEnable = 1
- AND B.IsEnable = 1
- AND B.RoleNo LIKE 'RecruitResume%'";
- toolbarRoles = DbAccess.QueryList(sql);
- if (toolbarRoles != null && toolbarRoles.Any())
- {
-
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTag").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
@@ -1481,6 +1418,19 @@ public partial class CommonServices : BaseServices>, ICommon
icon = "ess-icon-reject",
position = "left"
});
+ }
+ break;
+ case "F_ResumeMaintenance_Hire"://录用
+ sql = $@"SELECT A.RoleId, B.RoleNo, B.RoleName
+ FROM Ghrs_UserRole A LEFT JOIN Ghrs_Role B ON A.RoleId = B.RoleId
+ WHERE A.UserID = {App.User.ID}
+ AND A.IsEnable = 1
+ AND B.IsEnable = 1
+ AND B.RoleNo LIKE 'RecruitResume%'";
+ toolbarRoles = DbAccess.QueryList(sql);
+ if (toolbarRoles != null && toolbarRoles.Any())
+ {
+
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeSendOffer").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
@@ -1531,6 +1481,56 @@ public partial class CommonServices : BaseServices>, ICommon
icon = "ess-icon-reject",
position = "left"
});
+ if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTag").Any())
+ result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+ {
+ display = true,
+ fnKey = "TBD6YN",
+ fnTitle = "标签",
+ fnType = "row",
+ icon = "ess-icon-reject",
+ position = "left"
+ });
+ if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeRecycle").Any())
+ result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+ {
+ display = true,
+ fnKey = "TBD7YN",
+ fnTitle = "回收",
+ fnType = "row",
+ icon = "ess-icon-reject",
+ position = "left"
+ });
+ if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTalentPool").Any())
+ result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+ {
+ display = true,
+ fnKey = "TBD8YN",
+ fnTitle = "加入人才库",
+ fnType = "row",
+ icon = "ess-icon-reject",
+ position = "left"
+ });
+ if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeBlacklist").Any())
+ result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+ {
+ display = true,
+ fnKey = "TBD9YN",
+ fnTitle = "加入黑名单",
+ fnType = "row",
+ icon = "ess-icon-reject",
+ position = "left"
+ });
+ if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeDownLoad").Any())
+ result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+ {
+ display = true,
+ fnKey = "TBD10YN",
+ fnTitle = "下载",
+ fnType = "row",
+ icon = "ess-icon-reject",
+ position = "left"
+ });
}
break;
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index d74e5098..7e481f08 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -1791,7 +1791,7 @@ END";
if (!isChangeInterviewTime)
await LogRecord(order.Id, $"预约面试，面试时间：{string.Join("、", form.Times)}，约面反馈：{order.AppointmentFeedback ?? "无"}", id, null, "SubscribeInterview");
else
- await LogRecord(order.Id, $"修改面试时间，面试时间：{string.Join("、", form.Times)},备注：{(form.Remark ?? "无")}", id, null, "ChangeInterviewDate");
+ await LogRecord(order.Id, $"修改面试时间，面试时间：{string.Join("、", form.Times)}，备注：{(form.Remark ?? "无")}", id, null, "ChangeInterviewDate");
#endregion
@@ -1812,8 +1812,8 @@ END";
if (entity == null)
return ServiceResult.OprateFailed("无效的简历ID！");
- if (entity.Status != DIC_INTERVIEW_ORDER_STATUS.WaitAppointment)
- return ServiceResult.OprateFailed("【待预约】状态下才能安排面试！");
+ //if (entity.Status != DIC_INTERVIEW_ORDER_STATUS.WaitAppointment)
+ // return ServiceResult.OprateFailed("【待预约】状态下才能安排面试！");
if (body.Time.IndexOf("~") < 0)
throw new Exception($"传入时间【{body.Time}】无效，请检查格式！");
@@ -1847,7 +1847,7 @@ END";
await _ghrh_InterviewRecordServices.Update(records, ["InterviewTime", "InterviewBeginTime", "InterviewEndTime", "Status", "UpdateTime", "UpdateBy"]);
await _ghrh_InterviewOrderServices.Update(order, ["InterviewStepName", "UpdateTime", "UpdateBy"]);
- await LogRecord(order.Id, $"安排面试，面试时间：{body.Time},面试地点：{body.InterviewAddress}，面试备注：{body.Remark ?? "无"}", id, records[0].Id, "ScheduleInterview", true);
+ await LogRecord(order.Id, $"安排面试，面试时间：{body.Time}，面试地点：{body.InterviewAddress}，面试备注：{body.Remark ?? "无"}", id, records[0].Id, "ScheduleInterview", true);
entity.Status = DIC_INTERVIEW_ORDER_STATUS.WaitInterview;
await Update(entity, ["Status", "UpdateTime", "UpdateBy"]);
@@ -2347,7 +2347,7 @@ END";
await Update(entity, ["Status"]);
await _ghrh_InterviewOrderServices.Update(order, ["Status"]);
await _ghrh_InterviewRecordServices.Update(records, ["Status"]);
- await LogRecord(order.Id, "变更是否报道！");
+ await LogRecord(order.Id, isOffer == true ? "标记为已报到！" : "标记为未报到！", id, null, "CheckIn");
}
}
@@ -3645,7 +3645,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status";
default:
break;
}
-
+ item.Attachments = attachments;
items.Add(item);
}
logs.Add(new ResumeLog()