Simon
/
Tiobon.Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
master
xiaochanghai 6 months ago
parent deea32dfc2
commit 81767b604e
3 changed files with 92 additions and 92 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml
  2. 146
      Tiobon.Core.Services/CommonServices.cs
  3. 12
      Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

14
Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml
Unescape View File

@ -84,7 +84,7 @@
{ {
@if (i > 0) @if (i > 0)
{ {
<div style="margin-top:20px;width:100%"></div> <div style="margin-top:20px;width:100%;float: left;"></div>
} }
@if (item.children != null && item.children.Any()) @if (item.children != null && item.children.Any())
{ {
@ -124,7 +124,7 @@
{ {
if (i > 0) if (i > 0)
{ {
<div style="margin-top:20px;width:100%"></div> <div style="margin-top:20px;width:100%;float: left;"></div>
} }
if (item.children != null && item.children.Any()) if (item.children != null && item.children.Any())
foreach (var children in item.children) foreach (var children in item.children)
@ -159,7 +159,7 @@
{ {
if (i > 0) if (i > 0)
{ {
<div style="margin-top:20px;width:100%"></div> <div style="margin-top:20px;width:100%;float: left;"></div>
} }
if (item.children != null && item.children.Any()) if (item.children != null && item.children.Any())
foreach (var children in item.children) foreach (var children in item.children)
@ -195,7 +195,7 @@
{ {
if (i > 0) if (i > 0)
{ {
<div style="margin-top:20px;width:100%"></div> <div style="margin-top:20px;width:100%;float: left;"></div>
} }
if (item.children != null && item.children.Any()) if (item.children != null && item.children.Any())
foreach (var children in item.children) foreach (var children in item.children)
@ -230,7 +230,7 @@
{ {
if (i > 0) if (i > 0)
{ {
<div style="margin-top:20px;width:100%"></div> <div style="margin-top:20px;width:100%;float: left;"></div>
} }
if (item.children != null && item.children.Any()) if (item.children != null && item.children.Any())
foreach (var children in item.children) foreach (var children in item.children)
@ -262,7 +262,7 @@
@item.tabName @item.tabName
</div> </div>
} }
<div style="float:left;width:80%;padding-left: 10px;color: #ff9300;">@Html.Raw(ViewBag.StatementRemark)</div> <div style="float:left;padding-left: 10px;color: #ff9300;">@Html.Raw(ViewBag.StatementRemark)</div>
if (item.children != null && item.children.Any()) if (item.children != null && item.children.Any())
foreach (var children in item.children) foreach (var children in item.children)
@ -295,7 +295,7 @@
} }
@if (displaySignatureArea) @if (displaySignatureArea)
{ {
<div style="float:left;width:80%;padding-left: 10px;">申请人签名：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;日期：</div> <div style="float:left;padding-left: 10px;">申请人签名：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;日期：</div>
} }
</div> </div>
} }

146
Tiobon.Core.Services/CommonServices.cs
Unescape View File

@ -1234,6 +1234,16 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" 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()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTag").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
@ -1284,16 +1294,6 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" 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; break;
@ -1308,112 +1308,112 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
if (toolbarRoles != null && toolbarRoles.Any()) if (toolbarRoles != null && toolbarRoles.Any())
{ {
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTag").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeProcessRemind").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD6YN", fnKey = "TBD12YN",
fnTitle = "标签", fnTitle = "提醒",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeRecycle").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeReScheduleInterview").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD7YN", fnKey = "TBD5YN",
fnTitle = "回收", fnTitle = "重新推荐",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTalentPool").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeScheduleInterview").Any())
{
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD8YN", fnKey = "TBD13YN",
fnTitle = "加入人才库", fnTitle = "安排面试",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeBlacklist").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD9YN", fnKey = "TBD25YN",
fnTitle = "加入黑名单", fnTitle = "安排面试",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeDownLoad").Any()) }
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeApplyOffer").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD10YN", fnKey = "TBD15YN",
fnTitle = "下载", fnTitle = "发起录用审批",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeProcessRemind").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD12YN", fnKey = "TBD26YN",
fnTitle = "提醒", fnTitle = "转入待发offer",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeScheduleInterview").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTag").Any())
{
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD13YN", fnKey = "TBD6YN",
fnTitle = "安排面试", fnTitle = "标签",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeRecycle").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD25YN", fnKey = "TBD7YN",
fnTitle = "安排面试", fnTitle = "回收",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
} if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTalentPool").Any())
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeReScheduleInterview").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD5YN", fnKey = "TBD8YN",
fnTitle = "重新推荐", fnTitle = "加入人才库",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeApplyOffer").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeBlacklist").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD15YN", fnKey = "TBD9YN",
fnTitle = "发起录用审批", fnTitle = "加入黑名单",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeDownLoad").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD26YN", fnKey = "TBD10YN",
fnTitle = "转入待发offer", fnTitle = "下载",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
@ -1431,102 +1431,102 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
if (toolbarRoles != null && toolbarRoles.Any()) if (toolbarRoles != null && toolbarRoles.Any())
{ {
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTag").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeSendOffer").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD6YN", fnKey = "TBD16YN",
fnTitle = "标签", fnTitle = "发offer",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeRecycle").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeOfferRemind").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD7YN", fnKey = "TBD17YN",
fnTitle = "回收", fnTitle = "提醒",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTalentPool").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeOfferHasWork").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD8YN", fnKey = "TBD18YN",
fnTitle = "加入人才库", fnTitle = "已报到",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeBlacklist").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeOfferNoWork").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD9YN", fnKey = "TBD19YN",
fnTitle = "加入黑名单", fnTitle = "未报到",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeDownLoad").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD10YN", fnKey = "TBD27YN",
fnTitle = "下载", fnTitle = "Offer下载",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeSendOffer").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTag").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD16YN", fnKey = "TBD6YN",
fnTitle = "发offer", fnTitle = "标签",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeOfferRemind").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeRecycle").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD17YN", fnKey = "TBD7YN",
fnTitle = "提醒", fnTitle = "回收",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeOfferHasWork").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeTalentPool").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD18YN", fnKey = "TBD8YN",
fnTitle = "已报到", fnTitle = "加入人才库",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeOfferNoWork").Any()) if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeBlacklist").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD19YN", fnKey = "TBD9YN",
fnTitle = "未报到", fnTitle = "加入黑名单",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"
}); });
if (toolbarRoles.Where(x => x.RoleNo == "RecruitResumeDownLoad").Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar() result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{ {
display = true, display = true,
fnKey = "TBD27YN", fnKey = "TBD10YN",
fnTitle = "Offer下载", fnTitle = "下载",
fnType = "row", fnType = "row",
icon = "ess-icon-reject", icon = "ess-icon-reject",
position = "left" position = "left"

12
Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
Unescape View File

@ -1791,7 +1791,7 @@ END";
if (!isChangeInterviewTime) if (!isChangeInterviewTime)
await LogRecord(order.Id, $"预约面试，面试时间：{string.Join("、", form.Times)}，约面反馈：{order.AppointmentFeedback ?? "无"}", id, null, "SubscribeInterview"); await LogRecord(order.Id, $"预约面试，面试时间：{string.Join("、", form.Times)}，约面反馈：{order.AppointmentFeedback ?? "无"}", id, null, "SubscribeInterview");
else 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 #endregion
@ -1812,8 +1812,8 @@ END";
if (entity == null) if (entity == null)
return ServiceResult.OprateFailed("无效的简历ID！"); return ServiceResult.OprateFailed("无效的简历ID！");
if (entity.Status != DIC_INTERVIEW_ORDER_STATUS.WaitAppointment) //if (entity.Status != DIC_INTERVIEW_ORDER_STATUS.WaitAppointment)
return ServiceResult.OprateFailed("【待预约】状态下才能安排面试！"); // return ServiceResult.OprateFailed("【待预约】状态下才能安排面试！");
if (body.Time.IndexOf("~") < 0) if (body.Time.IndexOf("~") < 0)
throw new Exception($"传入时间【{body.Time}】无效，请检查格式！"); throw new Exception($"传入时间【{body.Time}】无效，请检查格式！");
@ -1847,7 +1847,7 @@ END";
await _ghrh_InterviewRecordServices.Update(records, ["InterviewTime", "InterviewBeginTime", "InterviewEndTime", "Status", "UpdateTime", "UpdateBy"]); await _ghrh_InterviewRecordServices.Update(records, ["InterviewTime", "InterviewBeginTime", "InterviewEndTime", "Status", "UpdateTime", "UpdateBy"]);
await _ghrh_InterviewOrderServices.Update(order, ["InterviewStepName", "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; entity.Status = DIC_INTERVIEW_ORDER_STATUS.WaitInterview;
await Update(entity, ["Status", "UpdateTime", "UpdateBy"]); await Update(entity, ["Status", "UpdateTime", "UpdateBy"]);
@ -2347,7 +2347,7 @@ END";
await Update(entity, ["Status"]); await Update(entity, ["Status"]);
await _ghrh_InterviewOrderServices.Update(order, ["Status"]); await _ghrh_InterviewOrderServices.Update(order, ["Status"]);
await _ghrh_InterviewRecordServices.Update(records, ["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: default:
break; break;
} }
item.Attachments = attachments;
items.Add(item); items.Add(item);
} }
logs.Add(new ResumeLog() logs.Add(new ResumeLog()

Write Preview
Loading…
Cancel
Save