diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 7d12b2dd..5cef6047 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -41285,7 +41285,7 @@ Ghra_staff_InsureBase Ghrh_InterviewRecord 1731491242 Administrator -1732609414 +1732771004 Administrator 面试记录 @@ -41633,6 +41633,18 @@ Ghra_staff_InsureBase 256 +0D98AC96-48D3-45C1-BA9A-0E8ABFA0A256 +面试环节 +InterviewStepName +1732770998 +Administrator +1732771004 +Administrator +面试环节 +nvarchar(32) +32 + + 19D58F72-C794-42D7-83FB-85ADC5FE23AC 筛选反馈 FilterFeedback @@ -41644,7 +41656,7 @@ Ghra_staff_InsureBase nvarchar(256) 256 - + 974AA4C5-A8A9-41DB-ABD6-913DC09B6E39 约面反馈 AppointmentFeedback @@ -41656,7 +41668,7 @@ Ghra_staff_InsureBase nvarchar(256) 256 - + 0F520988-F903-4077-B564-855703729339 录用反馈 OfferFeedback @@ -41668,7 +41680,7 @@ Ghra_staff_InsureBase nvarchar(256) 256 - + C736F621-9E1E-41DC-9115-C60B06CD54DA 状态 Status @@ -41680,7 +41692,7 @@ Ghra_staff_InsureBase nvarchar(32) 32 - + 690F8DB4-C18A-453C-80D3-FEF13C5120AA 备注 RemarkSz @@ -41695,7 +41707,7 @@ Ghra_staff_InsureBase - + C9FF77A8-68C0-422C-AC7D-678D371A44B5 默认标志 IsDefault @@ -41710,7 +41722,7 @@ Ghra_staff_InsureBase - + 5D7585F3-021E-4057-822B-68DD4DFE35C5 删除标志 IsEnable @@ -41725,7 +41737,7 @@ Ghra_staff_InsureBase - + 77808567-C5E3-41C9-ADF2-946B288D6A7D 预留字段1 Reverse1 @@ -41737,7 +41749,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 5CC0BE47-B3B3-42D8-B062-163112BD1540 预留字段2 Reverse2 @@ -41749,7 +41761,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + BE3E005E-4715-4FE2-9448-49F45E15B61A 预留字段3 Reverse3 @@ -41761,7 +41773,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + C5ADDA06-013D-4671-8A9F-2A4BBB035769 预留字段4 Reverse4 @@ -41773,7 +41785,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 47638E15-E31D-4C81-89B3-20D45FC8D5CD 预留字段5 Reverse5 @@ -41785,7 +41797,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 62326CFB-192F-4A10-AAD2-ECFCC74B1489 预留字段6 Reverse6 @@ -41797,7 +41809,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 54454335-7E26-4583-9CED-35F63F68BBE3 预留字段7 Reverse7 @@ -41809,7 +41821,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 0EB510B9-5519-4DBC-A47F-56439571757B 预留字段8 Reverse8 @@ -41821,7 +41833,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + D5473D59-8EE1-4CBB-8753-443D1B99C938 预留字段9 Reverse9 @@ -41833,7 +41845,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 89BA5980-4DA8-4602-8481-C24A4283643E 预留字段10 Reverse10 @@ -41845,7 +41857,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 896BF59A-75D4-4E31-A422-AFD11E0C1BB6 预留字段I1 ReverseI1 @@ -41857,7 +41869,7 @@ Ghra_staff_InsureBase 0 int - + 7039D60D-7075-4523-B0A5-490C7393B79B 预留字段I2 ReverseI2 @@ -41871,7 +41883,7 @@ Ghra_staff_InsureBase - + 75123F88-F634-4127-86CF-8751327D3813 Key_1 Key_1 @@ -41885,10 +41897,10 @@ Ghra_staff_InsureBase - + - + @@ -41912,7 +41924,7 @@ Ghra_staff_InsureBase - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -41946,7 +41958,7 @@ Ghra_staff_InsureBase - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -41961,7 +41973,7 @@ Ghra_staff_InsureBase - + 55EBFC84-83AC-4EDF-BADD-29FA719652D1 Reference_13 Reference_13 @@ -41980,7 +41992,7 @@ Ghra_staff_InsureBase - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -42014,7 +42026,7 @@ Ghra_staff_InsureBase - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -42048,7 +42060,7 @@ Ghra_staff_InsureBase - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -42082,7 +42094,7 @@ Ghra_staff_InsureBase - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -42116,7 +42128,7 @@ Ghra_staff_InsureBase - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -42150,7 +42162,7 @@ Ghra_staff_InsureBase - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -42184,7 +42196,7 @@ Ghra_staff_InsureBase - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -42218,7 +42230,7 @@ Ghra_staff_InsureBase - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -42252,7 +42264,7 @@ Ghra_staff_InsureBase - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -42286,7 +42298,7 @@ Ghra_staff_InsureBase - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -42320,7 +42332,7 @@ Ghra_staff_InsureBase - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -42354,7 +42366,7 @@ Ghra_staff_InsureBase - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -42388,7 +42400,7 @@ Ghra_staff_InsureBase - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -42422,7 +42434,7 @@ Ghra_staff_InsureBase - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator @@ -42437,7 +42449,7 @@ Ghra_staff_InsureBase - + 465DBD55-7683-4A4B-91D3-B7019ED619F0 Reference_114 Reference_114 @@ -42456,7 +42468,7 @@ Ghra_staff_InsureBase - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator @@ -42490,7 +42502,7 @@ Ghra_staff_InsureBase - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator @@ -42524,7 +42536,7 @@ Ghra_staff_InsureBase - + F7ECB7BC-BA8B-4606-B521-999C20FD5C43 1722318917 Administrator @@ -42558,7 +42570,7 @@ Ghra_staff_InsureBase - + 6764C448-6B6B-4DD7-AED9-8E74CDD1261A 1727335554 Administrator @@ -42592,7 +42604,7 @@ Ghra_staff_InsureBase - + C8D69BA0-B62F-4A3E-981C-59D5FC0C2A03 1727336760 Administrator @@ -42626,7 +42638,7 @@ Ghra_staff_InsureBase - + 09B3F4FA-149B-4BB2-8D4C-CB9E05153125 1727336895 Administrator @@ -42660,7 +42672,7 @@ Ghra_staff_InsureBase - + D0D47F43-60D2-4012-A1C6-7EE1F23B2B48 1727337857 Administrator @@ -42675,7 +42687,7 @@ Ghra_staff_InsureBase - + E261580B-7706-444D-9E7B-6A1A5968579B Reference_24 Reference_24 @@ -42694,7 +42706,7 @@ Ghra_staff_InsureBase - + A9F8F17E-368A-42BA-B603-19B2CAF61361 1728532955 Administrator @@ -42728,7 +42740,7 @@ Ghra_staff_InsureBase - + 88DE8617-23F2-4075-A9EB-3AEA05F12872 1728532977 Administrator @@ -42762,7 +42774,7 @@ Ghra_staff_InsureBase - + 36AE3FE2-B4E5-4FF7-ADD1-93D1ABD487CD 1728533087 Administrator @@ -42777,7 +42789,7 @@ Ghra_staff_InsureBase - + AB9D9DC4-987C-4E4B-9BD3-35091CDBA380 Reference_27 Reference_27 @@ -42796,7 +42808,7 @@ Ghra_staff_InsureBase - + E2D02611-09C9-42E2-AA43-22E820AF219C 1728626387 Administrator @@ -42830,7 +42842,7 @@ Ghra_staff_InsureBase - + 62F35C8E-87DA-43C4-AAE9-A47D112F8E0A 1728540045 Administrator @@ -42864,7 +42876,7 @@ Ghra_staff_InsureBase - + 3759DC14-1A7D-4121-AAE1-58CE6813A0AA 1728541044 Administrator @@ -42898,7 +42910,7 @@ Ghra_staff_InsureBase - + 1791558D-852F-437C-97F6-7F9D11EE26DB 1729662916 Administrator @@ -42932,7 +42944,7 @@ Ghra_staff_InsureBase - + 00049FDC-8297-463E-9347-A571E3AB9C9E 1729663415 Administrator @@ -42966,7 +42978,7 @@ Ghra_staff_InsureBase - + B7B6FBF6-DC05-4490-8656-A5DEAF831781 1730250294 Administrator @@ -43000,7 +43012,7 @@ Ghra_staff_InsureBase - + A0C97DD9-1C72-4A18-9FEE-EE6A9AEF21F8 1730336852 Administrator @@ -43034,7 +43046,7 @@ Ghra_staff_InsureBase - + 39FD6B5F-C473-44DF-969E-D851D388EBAE 1730340808 Administrator @@ -43068,7 +43080,7 @@ Ghra_staff_InsureBase - + C4EECAD7-F267-4702-A253-CA499692A254 1730346502 Administrator @@ -43102,7 +43114,7 @@ Ghra_staff_InsureBase - + 3EBD04DF-C924-4032-982C-CA9EF3B72E39 1731478017 Administrator @@ -43136,7 +43148,7 @@ Ghra_staff_InsureBase - + DE13B6DD-B49E-4F3E-8AF7-BEB535EE3CC6 1731478076 Administrator @@ -43170,7 +43182,7 @@ Ghra_staff_InsureBase - + 28C77E11-7423-4D63-9053-A5D40E7940AF 1731491451 Administrator @@ -43192,7 +43204,7 @@ Ghra_staff_InsureBase - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -43205,7 +43217,7 @@ Ghra_staff_InsureBase - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema 1597196432 @@ -43213,12 +43225,12 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -43230,7 +43242,7 @@ Ghra_staff_InsureBase - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -43240,7 +43252,7 @@ Ghra_staff_InsureBase ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -43250,7 +43262,7 @@ Ghra_staff_InsureBase Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -43261,7 +43273,7 @@ Ghra_staff_InsureBase nvarchar(256) 256 - + 538C6297-7080-43C1-9455-AD6516B6FBB2 数字 NUMBER @@ -43273,7 +43285,7 @@ Ghra_staff_InsureBase 20 6 - + AF15A9FA-052F-43E5-9102-57F195CBCFDE 类别 TYPE @@ -43284,7 +43296,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + D0936140-81BD-463E-B0ED-FE3F86828A2C 特长字符串 LONG_LONG_STRING @@ -43295,7 +43307,7 @@ Ghra_staff_InsureBase varchar(256) 256 - + 5FBDAFFC-EA04-407B-877F-58752C2E736C 金额 AMOUNT @@ -43307,7 +43319,7 @@ Ghra_staff_InsureBase 20 6 - + F461E3FD-0A64-4712-BC09-C0BA3C248E5B 描述 DESCRIPTION @@ -43318,7 +43330,7 @@ Ghra_staff_InsureBase varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -43329,7 +43341,7 @@ Ghra_staff_InsureBase varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -43351,7 +43363,7 @@ Ghra_staff_InsureBase varchar(2000) 2000 - + @@ -43365,7 +43377,7 @@ Ghra_staff_InsureBase char(1) 1 - + 82662C91-618F-4022-B9CD-1A431DC84A0A 名称 NAME @@ -43386,7 +43398,7 @@ Ghra_staff_InsureBase Administrator int - + 77F6BD58-5A9D-44F7-988C-76608A3F38B5 代码 CODE @@ -43418,7 +43430,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + DA200725-BFB0-4351-9C3E-DC30C036538E STATUS STATUS @@ -43429,7 +43441,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -43439,7 +43451,7 @@ Ghra_staff_InsureBase feipeng image - + 7CC45A5C-15C8-4CA8-BBEB-66FE3DAB482F 字符串512 STRING_512 @@ -43452,7 +43464,7 @@ Ghra_staff_InsureBase - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -43461,13 +43473,13 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - - + + - + 02EF92C9-49BF-45C7-934A-23BA290D5595 Microsoft SQL Server 2008 MSSQLSRV2008 diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index c76d1da8..e7ba2e29 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -6630,6 +6630,11 @@ 取消原因 + + + 面试环节 + + 筛选反馈 @@ -17531,6 +17536,11 @@ 取消原因 + + + 面试环节 + + 约面反馈 @@ -23857,6 +23867,11 @@ 面试地点 + + + 面试环节 + + 备注 diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewRecord.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewRecord.Dto.Base.cs index 35892a50..4473099a 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewRecord.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_InterviewRecord.Dto.Base.cs @@ -122,6 +122,12 @@ public class Ghrh_InterviewRecordBase [Display(Name = "CancelReason"), Description("取消原因"), MaxLength(256, ErrorMessage = "取消原因 不能超过 256 个字符")] public string CancelReason { get; set; } + /// + /// 面试环节 + /// + [Display(Name = "InterviewStepName"), Description("面试环节"), MaxLength(32, ErrorMessage = "面试环节 不能超过 32 个字符")] + public string InterviewStepName { get; set; } + /// /// 筛选反馈 /// diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewRecord.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewRecord.cs index eca6c1ce..df49b2da 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewRecord.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_InterviewRecord.cs @@ -123,6 +123,12 @@ public class Ghrh_InterviewRecord : BasePoco [Display(Name = "CancelReason"), Description("取消原因"), MaxLength(256, ErrorMessage = "取消原因 不能超过 256 个字符")] public string CancelReason { get; set; } + /// + /// 面试环节 + /// + [Display(Name = "InterviewStepName"), Description("面试环节"), MaxLength(32, ErrorMessage = "面试环节 不能超过 32 个字符")] + public string InterviewStepName { get; set; } + /// /// 约面反馈 /// diff --git a/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs b/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs index e4873e23..ae98524b 100644 --- a/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs +++ b/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs @@ -114,6 +114,11 @@ public class ResumeScheduleInterviewForm /// public string InterviewAddress { get; set; } + /// + /// 面试环节 + /// + public string InterviewStepName { get; set; } + /// /// 备注 /// diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs index 91d9b102..6069a2b5 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs @@ -74,7 +74,8 @@ public class Ghrh_HumanRequestServices : BaseServices().FirstAsync(o => result.ApplyDeptId == o.DeptID))?.DeptName; result.BelongDeptName = (await Db.Queryable().FirstAsync(o => result.BelongDeptId == o.DeptID))?.DeptName; - result.TitleName = (await Db.Queryable().FirstAsync(o => result.TitleId == o.TitleID))?.TitleName; + if (result.TitleId.IsNotEmptyOrNull()) + result.TitleName = (await Db.Queryable().FirstAsync(o => result.TitleId == o.TitleID))?.TitleName; #region 返回部门负责人信息 var dept = await Db.Queryable().Where(x => x.DeptID == result.BelongDeptId).FirstAsync(); diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 1a473d8b..86997ae4 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -1,7 +1,6 @@ using DinkToPdf; using DinkToPdf.Contracts; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; using System.IO.Compression; using static Tiobon.Core.Model.Consts; @@ -88,7 +87,6 @@ public class Ghrh_ResumeServices : BaseServices> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) @@ -275,6 +276,7 @@ public class Ghrh_ResumeServices : BaseServices { + x.ResumeId = x.Id; if (x.TitleId != null) x.TitleName = titles.Where(o => o.TitleID == x.TitleId).FirstOrDefault()?.TitleName; await SetLabel(x); @@ -288,8 +290,6 @@ public class Ghrh_ResumeServices : BaseServices o.ResumeId == x.ResumeId).FirstOrDefault(); if (order != null) { @@ -315,7 +315,6 @@ public class Ghrh_ResumeServices : BaseServices tagIds.Contains(x.Id)); list.ForEach(async x => { + x.ResumeId = x.Id; if (x.TitleId != null) x.TitleName = titles.Where(o => o.TitleID == x.TitleId).FirstOrDefault()?.TitleName; await SetLabel(x); @@ -1568,17 +1568,20 @@ END"; { var records = await _ghrh_InterviewRecordServices.Query(x => x.Round == order.Round && x.OrderId == order.Id); + order.InterviewStepName = body.InterviewStepName; records.ForEach(record => { record.InterviewTime = body.Time; record.InterviewBeginTime = Convert.ToDateTime(array[0]); record.InterviewEndTime = Convert.ToDateTime(array[1]); record.Status = DIC_INTERVIEW_ORDER_STATUS.WaitInterview; + record.InterviewStepName = body.InterviewStepName; record.RemarkSz = body.Remark; record.InterviewAddress = body.InterviewAddress; }); await _ghrh_InterviewRecordServices.Update(records, ["InterviewTime", "InterviewBeginTime", "InterviewEndTime", "Status"]); + await _ghrh_InterviewOrderServices.Update(order, ["InterviewStepName"]); await LogRecord(order.Id, $"安排面试，面试时间：{body.Time}"); @@ -2090,8 +2093,8 @@ FROM Ghrh_Resume A JOIN Ghrh_InterviewOrder B ON A.ID = B.ResumeId JOIN Ghrh_InterviewRecord C ON B.ID = C.OrderId - -- AND B.[Round] = C.[Round] -WHERE A.IsEnable = 1 AND C.IsEnable = 1"; + AND B.[Round] = C.[Round] +WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status"; if (string.IsNullOrWhiteSpace(filter.orderBy)) filter.orderBy = "CreateTime ASC"; @@ -2265,19 +2268,14 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1"; tagIds = tagIds.Distinct().ToList(); var tags = await _ghrh_ResumeTagServices.QueryDto(x => tagIds.Contains(x.Id)); + var orders = await _ghrh_InterviewOrderServices.QueryDto(x => x.ResumeId != null && ids.Contains(x.ResumeId.Value)); + list.ForEach(async x => { //x.ResumeId = x.Id; if (x.TitleId != null) x.TitleName = titles.Where(o => o.TitleID == x.TitleId).FirstOrDefault()?.TitleName; x.TitleLabel = x.TitleName; - x.GenderLabel = await GetParaLabel("Gender", x.Gender); - x.EducationLabel = await GetParaLabel("EducationalBGLevel", x.Education); - x.NationLabel = await GetParaLabel("A02", x.Nation); - x.MaritalStatusLabel = await GetParaLabel("A03", x.MaritalStatus); - x.PoliticStatusLabel = await GetParaLabel("A04", x.PoliticStatus); - x.UrgentRelationLabel = await GetParaLabel("SocialRelationType", x.UrgentRelation); - x.CertificateTypeLabel = await GetParaLabel("D51", x.CertificateType); - x.RegisteredTypeLabel = await GetParaLabel("A08", x.RegisteredType); + await SetLabel(x); x.EduBG = eduBGs.Where(o => x.ResumeId == o.ResumeId).ToList(); x.WorkExp = workExps.Where(o => x.ResumeId == o.ResumeId).ToList(); @@ -2287,19 +2285,31 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1"; x.TagList = tags.Where(o => tagIds1.Contains(o.Id)).Select(o => o.TagName).ToList(); } - #region 计算年龄 - if (x.Birthday != null && x.Birthday > DateTime.MinValue) + var order = orders.Where(o => o.ResumeId == x.ResumeId).FirstOrDefault(); + if (order != null) { - DateTime birthdate = (DateTime)x.Birthday; - DateTime now = DateTime.Now; - int age = now.Year - birthdate.Year; - if (now.Month < birthdate.Month || (now.Month == birthdate.Month && now.Day < birthdate.Day)) - age--; - x.Age = age; + x.IsPass = order.IsPass; + if (order.IsPass != null) + x.IsPassLabel = order.IsPass == true ? "通过" : "不通过"; + x.InterviewResult = order.InterviewResult; + x.OptionalInterviewTime = order.OptionalInterviewTime; + x.InterviewTime = order.InterviewTime; + if (x.Status != DIC_INTERVIEW_ORDER_STATUS.WaitRecommended) + { + x.HireDeptName = order.HireDeptName; + x.HireTitleName = order.HireTitleName; + x.Interviewer = order.Interviewer; + } + + x.InterviewTime1 = order.InterviewTime; + x.InterviewContent = order.InterviewContent; + + if (order.WaitInterviewStatus == "Cancel") + x.InterviewTime1 = "已取消"; + else if (order.WaitInterviewStatus == "HasChangeInterviewTime") + x.InterviewTime1 = "已改期"; + } - #endregion - if (x.IsPass != null) - x.IsPassLabel = x.IsPass == true ? "通过" : "不通过"; }); return new ServicePageResult(filter.pageNum, totalCount, filter.pageSize, list); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index c76d1da8..e7ba2e29 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -6630,6 +6630,11 @@ 取消原因 + + + 面试环节 + + 筛选反馈 @@ -17531,6 +17536,11 @@ 取消原因 + + + 面试环节 + + 约面反馈 @@ -23857,6 +23867,11 @@ 面试地点 + + + 面试环节 + + 备注