diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 0676009f..d9793fb9 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -8250,6 +8250,11 @@
厂区ID
+
+
+ 员工类别1
+
+
录用审批单薪资 (Dto.Base)
@@ -21901,6 +21906,11 @@
厂区ID
+
+
+ 员工类别1
+
+
录用审批单薪资 (Model)
diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_OfferApplyOrder.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_OfferApplyOrder.Dto.Base.cs
index 2474d893..2bd4a1ed 100644
--- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_OfferApplyOrder.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_OfferApplyOrder.Dto.Base.cs
@@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
-*V0.01 2024/12/24 14:54:00 SimonHsiao 初版
+*V0.01 2024/12/24 15:07:47 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@@ -73,12 +73,6 @@ public class Ghrh_OfferApplyOrderBase
[Display(Name = "StaffType"), Description("员工类别"), MaxLength(32, ErrorMessage = "员工类别 不能超过 32 个字符")]
public string StaffType { get; set; }
- ///
- /// 员工类别1
- ///
- [Display(Name = "StaffType1"), Description("员工类别1"), MaxLength(32, ErrorMessage = "员工类别1 不能超过 32 个字符")]
- public string StaffType1 { get; set; }
-
///
/// 职等
///
@@ -309,4 +303,10 @@ public class Ghrh_OfferApplyOrderBase
/// 厂区ID
///
public int? ZoneId { get; set; }
+
+ ///
+ /// 员工类别1
+ ///
+ [Display(Name = "StaffType1"), Description("员工类别1"), MaxLength(32, ErrorMessage = "员工类别1 不能超过 32 个字符")]
+ public string StaffType1 { get; set; }
}
diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_OfferApplyOrder.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_OfferApplyOrder.cs
index ccfa8954..cd574e5b 100644
--- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_OfferApplyOrder.cs
+++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_OfferApplyOrder.cs
@@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
-*V0.01 2024/12/24 14:54:00 SimonHsiao 初版
+*V0.01 2024/12/24 15:07:47 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@@ -74,12 +74,6 @@ public class Ghrh_OfferApplyOrder : BasePoco
[Display(Name = "StaffType"), Description("员工类别"), MaxLength(32, ErrorMessage = "员工类别 不能超过 32 个字符")]
public string StaffType { get; set; }
- ///
- /// 员工类别1
- ///
- [Display(Name = "StaffType1"), Description("员工类别1"), MaxLength(32, ErrorMessage = "员工类别1 不能超过 32 个字符")]
- public string StaffType1 { get; set; }
-
///
/// 职等
///
@@ -310,4 +304,10 @@ public class Ghrh_OfferApplyOrder : BasePoco
/// 厂区ID
///
public int? ZoneId { get; set; }
+
+ ///
+ /// 员工类别1
+ ///
+ [Display(Name = "StaffType1"), Description("员工类别1"), MaxLength(32, ErrorMessage = "员工类别1 不能超过 32 个字符")]
+ public string StaffType1 { get; set; }
}
diff --git a/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs b/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs
index 240f644f..e33bd302 100644
--- a/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs
+++ b/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs
@@ -231,7 +231,7 @@ public class ResumeRescheduleInterviewForm : ResumeRescheduleInterviewForm1
///
/// 时间段，2024/10/12 10:00~2024/10/12 11:00
///
- public string Time { get; set; }
+ public override string Time { get; set; }
}
public class ResumeRescheduleInterviewForm1
@@ -240,6 +240,7 @@ public class ResumeRescheduleInterviewForm1
/// 面试官列表
///
public List InterviewStaffs { get; set; }
+ public virtual string Time { get; set; }
}
public class ResumeAssessInterviewForm
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
index 262107fa..2fd7578e 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
@@ -329,6 +329,8 @@ public class Ghrh_OfferApplyOrderServices : BaseServices().Where(x => x.OrderId == applyOrder.Id).ToListAsync();
}
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index 0246846e..df0d9164 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -4045,6 +4045,8 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
dict.Add("PeriodMasterId", applyOrder.PeriodMasterId);
dict.Add("LegalCompanyID", applyOrder.CompanyId);
dict.Add("Reverse8", applyOrder.ProbationMonths);
+ dict.Add("ZoneID", applyOrder.ZoneId);
+ dict.Add("StaffType1", applyOrder.StaffType1);
//dict.Add("Reverse8", applyOrder.ProbationMonths);
}
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 44397edf..d9793fb9 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -8245,6 +8245,16 @@
计薪类别ID
+
+
+ 厂区ID
+
+
+
+
+ 员工类别1
+
+
录用审批单薪资 (Dto.Base)
@@ -21891,6 +21901,16 @@
计薪类别ID
+
+
+ 厂区ID
+
+
+
+
+ 员工类别1
+
+
录用审批单薪资 (Model)
@@ -28027,6 +28047,11 @@
审批状态
+
+
+ 厂区
+
+
录用审批单薪资(Dto.View1)