diff --git a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffLicence.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffLicence.cs
index 8dec4b62..b2618aee 100644
--- a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffLicence.cs
+++ b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffLicence.cs
@@ -21,12 +21,13 @@ namespace Tiobon.Core.Model.Models;
/// Ghra_StaffLicence (Model)
///
[SugarTable("Ghra_StaffLicence", "Ghra_StaffLicence"), Entity(TableCnName = "Ghra_StaffLicence", TableName = "Ghra_StaffLicence")]
-public class Ghra_StaffLicence : BasePoco
+public class Ghra_StaffLicence : BasePoco1
{
///
/// 证件ID
///
+ [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true), Display(Name = "表主键")]
public int? StaffLicenceID { get; set; }
///
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index 5893663b..03959ea5 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -1,5 +1,6 @@
using DinkToPdf;
using DinkToPdf.Contracts;
+using DnsClient;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;
using Microsoft.IdentityModel.Tokens;
@@ -3189,13 +3190,86 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status";
#region 证件
var Licences = await _ghrh_ResumeLicenceServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);
+ for (int i = 0; i < Licences.Count; i++)
+ {
+ var licence = Licences[i];
+ var staffEduBG = new Ghra_StaffLicence()
+ {
+ StaffID = staffId,
+ BeginDate = licence.BeginDate,
+ EndDate = licence.EndDate,
+ LicenceName = licence.LicenceName,
+ //LicenceLevel = licence.LicenceLevel,
+ //IsCompany = workExp.IsCompany,
+ LicenceNo = licence.LicenceNo,
+ //SeparationReason = licence.SeparationReason,
+ RemarkSz = licence.RemarkSz
+ };
+ var staffLicenceId = await Db.Insertable(staffEduBG).ExecuteReturnIdentityAsync();
+ var attachments = await Db.Queryable().Where(x => x.TableName == licence.Id.ObjToString()).ToListAsync();
+ if (attachments.Any())
+ {
+ attachments.ForEach(x =>
+ {
+ x.CreateTime = DateTime.Now;
+ x.TableName = "Ghra_StaffLicence";
+ x.StaffID = staffId;
+ x.TableKeyID = staffLicenceId;
+ });
+ await Db.Insertable(attachments).ExecuteReturnIdentityAsync();
+ }
+ }
#endregion
#region 简历培训记录
var Trainings = await _ghrh_ResumeTrainingServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);
+ for (int i = 0; i < Trainings.Count; i++)
+ {
+ var training = Trainings[i];
+ var staffEduBG = new Ghra_StaffTraining()
+ {
+ StaffID = staffId,
+ BeginDate = training.BeginDate,
+ EndDate = training.EndDate,
+ TrainingOrgName = training.TrainingOrgName,
+ ClassHour = training.ClassHour,
+ IsPass = training.IsPass == true ? 1 : 0,
+ CourseName = training.CourseName,
+ //ClassCredit = training.ClassCredit,
+ Reverse1 = training.Reverse1,
+ RemarkSz = training.RemarkSz
+ };
+ var staffTrainingId = await Db.Insertable(staffEduBG).ExecuteReturnIdentityAsync();
+ var attachments = await Db.Queryable().Where(x => x.TableName == training.Id.ObjToString()).ToListAsync();
+ if (attachments.Any())
+ {
+ attachments.ForEach(x =>
+ {
+ x.CreateTime = DateTime.Now;
+ x.TableName = "Ghra_StaffTraining";
+ x.StaffID = staffId;
+ x.TableKeyID = staffTrainingId;
+ });
+ await Db.Insertable(attachments).ExecuteReturnIdentityAsync();
+ }
+ }
+ #endregion
+ #region 附件
+ var attachments1 = await Db.Queryable().Where(x => x.TableName == id.ObjToString()).ToListAsync();
+ if (attachments1.Any())
+ {
+ attachments1.ForEach(x =>
+ {
+ x.CreateTime = DateTime.Now;
+ x.TableName = "Ghra_staff";
+ x.StaffID = staffId;
+ x.TableKeyID = staffId;
+ });
+ await Db.Insertable(attachments1).ExecuteReturnIdentityAsync();
+ }
#endregion
}
return true;
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 602bc30a..6fe825a2 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -864,6 +864,96 @@
IsSalaryPay
+
+
+ Ghra_StaffEduBG (Dto.Base)
+
+
+
+
+ 教育背景ID
+
+
+
+
+ 员工ID
+
+
+
+
+ 开始日期
+
+
+
+
+ 结束日期
+
+
+
+
+ 学校名称
+
+
+
+
+ 科系
+
+
+
+
+ 学历
+
+
+
+
+ 毕业否
+
+
+
+
+ RemarkSz
+
+
+
+
+ SortNo
+
+
+
+
+ IsDefault
+
+
+
+
+ AttachmentIDs
+
+
+
+
+ Reverse1
+
+
+
+
+ Reverse2
+
+
+
+
+ Reverse3
+
+
+
+
+ Reverse4
+
+
+
+
+ Reverse5
+
+
Ghra_StaffLicence (Dto.Base)
@@ -974,6 +1064,111 @@
Reverse5
+
+
+ Ghra_StaffSocialRelation (Dto.Base)
+
+
+
+
+ StaffSocialRelationID
+
+
+
+
+ StaffID
+
+
+
+
+ RelationType
+
+
+
+
+ RelationName
+
+
+
+
+ IDCardNo
+
+
+
+
+ Gender
+
+
+
+
+ Birthday
+
+
+
+
+ CompanyName
+
+
+
+
+ DeptName
+
+
+
+
+ RelationAddress
+
+
+
+
+ RelationTel
+
+
+
+
+ AttachmentIDs
+
+
+
+
+ RemarkSz
+
+
+
+
+ SortNo
+
+
+
+
+ IsDefault
+
+
+
+
+ Reverse1
+
+
+
+
+ Reverse2
+
+
+
+
+ Reverse3
+
+
+
+
+ Reverse4
+
+
+
+
+ Reverse5
+
+
Ghra_StaffTraining (Dto.Base)
@@ -1079,6 +1274,121 @@
Reverse5
+
+
+ Ghra_StaffWorkExp (Dto.Base)
+
+
+
+
+ 工作经历ID
+
+
+
+
+ 员工ID
+
+
+
+
+ 开始日期
+
+
+
+
+ 结束日
+
+
+
+
+ 公司名
+
+
+
+
+ 部门名
+
+
+
+
+ 职称名
+
+
+
+
+ 公司内
+
+
+
+
+ 计算年资
+
+
+
+
+ 本业
+
+
+
+
+ 年资
+
+
+
+
+ 离职原因
+
+
+
+
+ 薪资
+
+
+
+
+ AttachmentIDs
+
+
+
+
+ RemarkSz
+
+
+
+
+ SortNo
+
+
+
+
+ IsDefault
+
+
+
+
+ Reverse1
+
+
+
+
+ Reverse2
+
+
+
+
+ Reverse3
+
+
+
+
+ Reverse4
+
+
+
+
+ Reverse5
+
+
Ghra_Title (Dto.Base)
@@ -7845,6 +8155,11 @@
特殊饮食
+
+
+ 员工ID
+
+
教育背景 (Dto.Base)
@@ -11047,16 +11362,31 @@
Ghra_Staff (Dto.EditInput)
+
+
+ Ghra_StaffEduBG (Dto.EditInput)
+
+
Ghra_StaffLicence (Dto.EditInput)
+
+
+ Ghra_StaffSocialRelation (Dto.EditInput)
+
+
Ghra_StaffTraining (Dto.EditInput)
+
+
+ Ghra_StaffWorkExp (Dto.EditInput)
+
+
Ghra_Title (Dto.EditInput)
@@ -11447,16 +11777,31 @@
Ghra_Staff (Dto.InsertInput)
+
+
+ Ghra_StaffEduBG (Dto.InsertInput)
+
+
Ghra_StaffLicence (Dto.InsertInput)
+
+
+ Ghra_StaffSocialRelation (Dto.InsertInput)
+
+
Ghra_StaffTraining (Dto.InsertInput)
+
+
+ Ghra_StaffWorkExp (Dto.InsertInput)
+
+
Ghra_Title (Dto.InsertInput)
@@ -12868,24 +13213,114 @@
IsSalaryPay
-
+
- Ghra_StaffLicence (Model)
+ Ghra_StaffEduBG (Model)
-
+
- 证件ID
+ 教育背景ID
-
+
员工ID
-
+
- BeginDate
+ 开始日期
+
+
+
+
+ 结束日期
+
+
+
+
+ 学校名称
+
+
+
+
+ 科系
+
+
+
+
+ 学历
+
+
+
+
+ 毕业否
+
+
+
+
+ RemarkSz
+
+
+
+
+ SortNo
+
+
+
+
+ IsDefault
+
+
+
+
+ AttachmentIDs
+
+
+
+
+ Reverse1
+
+
+
+
+ Reverse2
+
+
+
+
+ Reverse3
+
+
+
+
+ Reverse4
+
+
+
+
+ Reverse5
+
+
+
+
+ Ghra_StaffLicence (Model)
+
+
+
+
+ 证件ID
+
+
+
+
+ 员工ID
+
+
+
+
+ BeginDate
@@ -12978,6 +13413,111 @@
Reverse5
+
+
+ Ghra_StaffSocialRelation (Model)
+
+
+
+
+ StaffSocialRelationID
+
+
+
+
+ StaffID
+
+
+
+
+ RelationType
+
+
+
+
+ RelationName
+
+
+
+
+ IDCardNo
+
+
+
+
+ Gender
+
+
+
+
+ Birthday
+
+
+
+
+ CompanyName
+
+
+
+
+ DeptName
+
+
+
+
+ RelationAddress
+
+
+
+
+ RelationTel
+
+
+
+
+ AttachmentIDs
+
+
+
+
+ RemarkSz
+
+
+
+
+ SortNo
+
+
+
+
+ IsDefault
+
+
+
+
+ Reverse1
+
+
+
+
+ Reverse2
+
+
+
+
+ Reverse3
+
+
+
+
+ Reverse4
+
+
+
+
+ Reverse5
+
+
Ghra_StaffTraining (Model)
@@ -13083,6 +13623,121 @@
Reverse5
+
+
+ Ghra_StaffWorkExp (Model)
+
+
+
+
+ 工作经历ID
+
+
+
+
+ 员工ID
+
+
+
+
+ 开始日期
+
+
+
+
+ 结束日
+
+
+
+
+ 公司名
+
+
+
+
+ 部门名
+
+
+
+
+ 职称名
+
+
+
+
+ 公司内
+
+
+
+
+ 计算年资
+
+
+
+
+ 本业
+
+
+
+
+ 年资
+
+
+
+
+ 离职原因
+
+
+
+
+ 薪资
+
+
+
+
+ AttachmentIDs
+
+
+
+
+ RemarkSz
+
+
+
+
+ SortNo
+
+
+
+
+ IsDefault
+
+
+
+
+ Reverse1
+
+
+
+
+ Reverse2
+
+
+
+
+ Reverse3
+
+
+
+
+ Reverse4
+
+
+
+
+ Reverse5
+
+
Ghra_Title (Model)
@@ -19986,6 +20641,11 @@
特殊饮食
+
+
+ 员工ID
+
+
教育背景 (Model)
@@ -23882,6 +24542,21 @@
修改信息
+
+
+ Ghra_StaffEduBG(Dto.View1)
+
+
+
+
+ 创建信息
+
+
+
+
+ 修改信息
+
+
Ghra_StaffLicence(Dto.View)
@@ -23897,6 +24572,21 @@
修改信息
+
+
+ Ghra_StaffSocialRelation(Dto.View1)
+
+
+
+
+ 创建信息
+
+
+
+
+ 修改信息
+
+
Ghra_StaffTraining(Dto.View)
@@ -23912,6 +24602,21 @@
修改信息
+
+
+ Ghra_StaffWorkExp(Dto.View1)
+
+
+
+
+ 创建信息
+
+
+
+
+ 修改信息
+
+
Ghra_Title(Dto.View)
diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml
index 2d1fac9a..c7af8d54 100644
--- a/Tiobon.Core/Tiobon.Core.xml
+++ b/Tiobon.Core/Tiobon.Core.xml
@@ -696,16 +696,31 @@
+
+
+ Ghra_StaffEduBG(Controller)
+
+
Ghra_StaffLicence(Controller)
+
+
+ Ghra_StaffSocialRelation(Controller)
+
+
Ghra_StaffTraining(Controller)
+
+
+ Ghra_StaffWorkExp(Controller)
+
+
Ghra_Title(Controller)