|
|
|
|
@ -9,6 +9,9 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins |
|
|
|
|
private readonly IGhrh_ResumeEduBGServices _ghrh_ResumeEduBGServices; |
|
|
|
|
private readonly IGhrh_ResumeWorkExpServices _ghrh_ResumeWorkExpServices; |
|
|
|
|
private readonly IGhrh_ResumeTagServices _ghrh_ResumeTagServices; |
|
|
|
|
/// <summary> |
|
|
|
|
/// 家庭关系 |
|
|
|
|
/// </summary> |
|
|
|
|
private readonly IGhrh_ResumeHomeServices _ghrh_ResumeHomeServices; |
|
|
|
|
private readonly IGhrh_ResumeLicenceServices _ghrh_ResumeLicenceServices; |
|
|
|
|
private readonly IGhrh_ResumeTrainingServices _ghrh_ResumeTrainingServices; |
|
|
|
|
@ -181,7 +184,7 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins |
|
|
|
|
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.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); |
|
|
|
|
@ -358,7 +361,7 @@ public class Ghrh_ResumeServices : BaseServices<Ghrh_Resume, Ghrh_ResumeDto, Ins |
|
|
|
|
|
|
|
|
|
id = resume.Id; |
|
|
|
|
|
|
|
|
|
if (resume.StaffName != input.StaffName) |
|
|
|
|
if (resume.StaffName != input.StaffName && resume.ApplicationStatus != "Submit") |
|
|
|
|
await base.Update(id, input, ["StaffName"]); |
|
|
|
|
|
|
|
|
|
obj.ApplicationStatus = resume.ApplicationStatus ?? "Hold"; |
|
|
|
|
@ -470,6 +473,14 @@ BEGIN |
|
|
|
|
FROM Ghrs_ParaMaster |
|
|
|
|
WHERE ParaMasterId = |
|
|
|
|
pp.DataSource) |
|
|
|
|
WHEN pp.DataSourceType = |
|
|
|
|
'CommonList' |
|
|
|
|
THEN |
|
|
|
|
(SELECT 'CommonList_' |
|
|
|
|
+ ListCommonSqlNo |
|
|
|
|
FROM Ghrs_ListCommonSql |
|
|
|
|
WHERE ListCommonSqlId = |
|
|
|
|
pp.DataSource) |
|
|
|
|
ELSE |
|
|
|
|
NULL |
|
|
|
|
END dataSource, |
|
|
|
|
@ -514,6 +525,14 @@ BEGIN |
|
|
|
|
FROM Ghrs_ParaMaster |
|
|
|
|
WHERE ParaMasterId = |
|
|
|
|
pp.DataSource) |
|
|
|
|
WHEN pp.DataSourceType = |
|
|
|
|
'CommonList' |
|
|
|
|
THEN |
|
|
|
|
(SELECT 'CommonList_' |
|
|
|
|
+ ListCommonSqlNo |
|
|
|
|
FROM Ghrs_ListCommonSql |
|
|
|
|
WHERE ListCommonSqlId = |
|
|
|
|
pp.DataSource) |
|
|
|
|
ELSE |
|
|
|
|
NULL |
|
|
|
|
END dataSource, |
|
|
|
|
@ -532,7 +551,7 @@ BEGIN |
|
|
|
|
AND kk.IsDisplay = 1 |
|
|
|
|
AND pp.IsEnable = 1 |
|
|
|
|
AND kk.IsEnable = 1 |
|
|
|
|
order by kk.SortNo |
|
|
|
|
order by kk.SortNo |
|
|
|
|
FOR JSON PATH, INCLUDE_NULL_VALUES), |
|
|
|
|
'') |
|
|
|
|
END |
|
|
|
|
@ -566,6 +585,7 @@ END"; |
|
|
|
|
{ |
|
|
|
|
field = "PhotoUrls", |
|
|
|
|
elementType = "FileUpload", |
|
|
|
|
label = "照片", |
|
|
|
|
editable = "1" |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
@ -611,21 +631,21 @@ END"; |
|
|
|
|
columnNames = formColumns.Where(x => x.GroupType == "Family").Select(x => x.ColumnName).ToList(); |
|
|
|
|
columnNames = columnNames.Distinct().ToList(); |
|
|
|
|
var familys = await _ghrh_ResumeHomeServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id); |
|
|
|
|
var family = new List<Dictionary<string, object>>(); |
|
|
|
|
familys.ForEach(x => |
|
|
|
|
var familyDic = new List<Dictionary<string, object>>(); |
|
|
|
|
familys.ForEach(family => |
|
|
|
|
{ |
|
|
|
|
var dicts = new Dictionary<string, object>(); |
|
|
|
|
columnNames.ForEach(x => |
|
|
|
|
{ |
|
|
|
|
var value = entity.GetPropertyValue(x); |
|
|
|
|
var value = family.GetPropertyValue(x); |
|
|
|
|
dicts.Add(x, value); |
|
|
|
|
}); |
|
|
|
|
if (columnNames.Any(x => x == "AttachmentIDs")) |
|
|
|
|
dicts["AttachmentIDs"] = x.AttachmentIDs; |
|
|
|
|
family.Add(dicts); |
|
|
|
|
dicts["AttachmentIDs"] = family.AttachmentIDs; |
|
|
|
|
familyDic.Add(dicts); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
Data.Family = family; |
|
|
|
|
Data.Family = familyDic; |
|
|
|
|
#endregion |
|
|
|
|
|
|
|
|
|
#region 教育背景 |
|
|
|
|
@ -633,84 +653,84 @@ END"; |
|
|
|
|
columnNames = formColumns.Where(x => x.GroupType == "Education").Select(x => x.ColumnName).ToList(); |
|
|
|
|
columnNames = columnNames.Distinct().ToList(); |
|
|
|
|
var educations = await _ghrh_ResumeEduBGServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id); |
|
|
|
|
var education = new List<Dictionary<string, object>>(); |
|
|
|
|
educations.ForEach(x => |
|
|
|
|
var educationDic = new List<Dictionary<string, object>>(); |
|
|
|
|
educations.ForEach(education => |
|
|
|
|
{ |
|
|
|
|
var dicts = new Dictionary<string, object>(); |
|
|
|
|
columnNames.ForEach(x => |
|
|
|
|
{ |
|
|
|
|
var value = entity.GetPropertyValue(x); |
|
|
|
|
var value = education.GetPropertyValue(x); |
|
|
|
|
dicts.Add(x, value); |
|
|
|
|
}); |
|
|
|
|
if (columnNames.Any(x => x == "AttachmentIDs")) |
|
|
|
|
dicts["AttachmentIDs"] = x.AttachmentIDs; |
|
|
|
|
education.Add(dicts); |
|
|
|
|
dicts["AttachmentIDs"] = education.AttachmentIDs; |
|
|
|
|
educationDic.Add(dicts); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
Data.Education = education; |
|
|
|
|
Data.Education = educationDic; |
|
|
|
|
#endregion |
|
|
|
|
|
|
|
|
|
#region 工作经历 |
|
|
|
|
columnNames = formColumns.Where(x => x.GroupType == "WorkExp").Select(x => x.ColumnName).ToList(); |
|
|
|
|
columnNames = columnNames.Distinct().ToList(); |
|
|
|
|
var workExps = await _ghrh_ResumeWorkExpServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id); |
|
|
|
|
var workExp = new List<Dictionary<string, object>>(); |
|
|
|
|
workExps.ForEach(x => |
|
|
|
|
var workExpDic = new List<Dictionary<string, object>>(); |
|
|
|
|
workExps.ForEach(workExp => |
|
|
|
|
{ |
|
|
|
|
var dicts = new Dictionary<string, object>(); |
|
|
|
|
columnNames.ForEach(x => |
|
|
|
|
{ |
|
|
|
|
var value = entity.GetPropertyValue(x); |
|
|
|
|
var value = workExp.GetPropertyValue(x); |
|
|
|
|
dicts.Add(x, value); |
|
|
|
|
}); |
|
|
|
|
if (columnNames.Any(x => x == "AttachmentIDs")) |
|
|
|
|
dicts["AttachmentIDs"] = x.AttachmentIDs; |
|
|
|
|
workExp.Add(dicts); |
|
|
|
|
dicts["AttachmentIDs"] = workExp.AttachmentIDs; |
|
|
|
|
workExpDic.Add(dicts); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
Data.WorkExp = workExp; |
|
|
|
|
Data.WorkExp = workExpDic; |
|
|
|
|
#endregion |
|
|
|
|
|
|
|
|
|
#region 证件 |
|
|
|
|
columnNames = formColumns.Where(x => x.GroupType == "Licence").Select(x => x.ColumnName).ToList(); |
|
|
|
|
columnNames = columnNames.Distinct().ToList(); |
|
|
|
|
var Licences = await _ghrh_ResumeLicenceServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id); |
|
|
|
|
var Licence = new List<Dictionary<string, object>>(); |
|
|
|
|
Licences.ForEach(x => |
|
|
|
|
var licenceDic = new List<Dictionary<string, object>>(); |
|
|
|
|
Licences.ForEach(licence => |
|
|
|
|
{ |
|
|
|
|
var dicts = new Dictionary<string, object>(); |
|
|
|
|
columnNames.ForEach(x => |
|
|
|
|
{ |
|
|
|
|
var value = entity.GetPropertyValue(x); |
|
|
|
|
var value = licence.GetPropertyValue(x); |
|
|
|
|
dicts.Add(x, value); |
|
|
|
|
}); |
|
|
|
|
if (columnNames.Any(x => x == "AttachmentIDs")) |
|
|
|
|
dicts["AttachmentIDs"] = x.AttachmentIDs; |
|
|
|
|
Licence.Add(dicts); |
|
|
|
|
dicts["AttachmentIDs"] = licence.AttachmentIDs; |
|
|
|
|
licenceDic.Add(dicts); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
Data.Licence = Licence; |
|
|
|
|
Data.Licence = licenceDic; |
|
|
|
|
#endregion |
|
|
|
|
|
|
|
|
|
#region 简历培训记录 |
|
|
|
|
columnNames = formColumns.Where(x => x.GroupType == "Training").Select(x => x.ColumnName).ToList(); |
|
|
|
|
columnNames = columnNames.Distinct().ToList(); |
|
|
|
|
var Trainings = await _ghrh_ResumeTrainingServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id); |
|
|
|
|
var Training = new List<Dictionary<string, object>>(); |
|
|
|
|
Trainings.ForEach(x => |
|
|
|
|
var trainingDic = new List<Dictionary<string, object>>(); |
|
|
|
|
Trainings.ForEach(training => |
|
|
|
|
{ |
|
|
|
|
var dicts = new Dictionary<string, object>(); |
|
|
|
|
columnNames.ForEach(x => |
|
|
|
|
{ |
|
|
|
|
var value = entity.GetPropertyValue(x); |
|
|
|
|
var value = training.GetPropertyValue(x); |
|
|
|
|
dicts.Add(x, value); |
|
|
|
|
}); |
|
|
|
|
if (columnNames.Any(x => x == "AttachmentIDs")) |
|
|
|
|
dicts["AttachmentIDs"] = x.AttachmentIDs; |
|
|
|
|
Training.Add(dicts); |
|
|
|
|
dicts["AttachmentIDs"] = training.AttachmentIDs; |
|
|
|
|
trainingDic.Add(dicts); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
Data.Training = Training; |
|
|
|
|
Data.Training = trainingDic; |
|
|
|
|
#endregion |
|
|
|
|
|
|
|
|
|
Data.Attachment = await Db.Queryable<Ghrs_Attachment>().Where(x => x.TableName == id.ObjToString()).ToListAsync(); |
|
|
|
|
@ -1056,7 +1076,7 @@ END"; |
|
|
|
|
else if (x.ColumnName == "PoliticStatus") |
|
|
|
|
x.ColumnName = "PoliticStatusLabel"; |
|
|
|
|
else if (x.ColumnName == "UrgentRelation") |
|
|
|
|
x.ColumnName = "UrgentRelationLabel"; |
|
|
|
|
x.ColumnName = "UrgentRelationLabel"; |
|
|
|
|
else if (x.ColumnName == "CertificateType") |
|
|
|
|
x.ColumnName = "CertificateTypeLabel"; |
|
|
|
|
else if (x.ColumnName == "RegisteredType") |
|
|
|
|
|
xiaochanghai
7 months ago