diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 44397edf..0676009f 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -8245,6 +8245,11 @@
计薪类别ID
+
+
+ 厂区ID
+
+
录用审批单薪资 (Dto.Base)
@@ -21891,6 +21896,11 @@
计薪类别ID
+
+
+ 厂区ID
+
+
录用审批单薪资 (Model)
@@ -28027,6 +28037,11 @@
审批状态
+
+
+ 厂区
+
+
录用审批单薪资(Dto.View1)
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 984b46e8..2474d893 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/10 11:55:55 SimonHsiao 初版
+*V0.01 2024/12/24 14:54:00 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@@ -73,6 +73,12 @@ 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; }
+
///
/// 职等
///
@@ -298,4 +304,9 @@ public class Ghrh_OfferApplyOrderBase
/// 计薪类别ID
///
public int? PeriodMasterId { get; set; }
+
+ ///
+ /// 厂区ID
+ ///
+ public int? ZoneId { get; set; }
}
diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_OfferApplyOrder.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_OfferApplyOrder.cs
index a1d93540..ccfa8954 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/10 11:55:55 SimonHsiao 初版
+*V0.01 2024/12/24 14:54:00 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@@ -74,6 +74,12 @@ 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; }
+
///
/// 职等
///
@@ -299,4 +305,9 @@ public class Ghrh_OfferApplyOrder : BasePoco
/// 计薪类别ID
///
public int? PeriodMasterId { get; set; }
+
+ ///
+ /// 厂区ID
+ ///
+ public int? ZoneId { get; set; }
}
diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_OfferApplyOrder.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_OfferApplyOrder.Dto.View.cs
index 0b6d0e27..f847e7f0 100644
--- a/Tiobon.Core.Model/View/Ghrh/Ghrh_OfferApplyOrder.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_OfferApplyOrder.Dto.View.cs
@@ -73,5 +73,12 @@ public class Ghrh_OfferApplyOrderDto : Ghrh_OfferApplyOrder
public string WorkStateLabel { get; set; }
public string ReportName { get; set; }
public string ApplicantName { get; set; }
+
+ ///
+ /// 厂区
+ ///
+ public string ZoneName { get; set; }
+
+
}
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
index 7739e071..262107fa 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
@@ -43,7 +43,18 @@ public class Ghrh_OfferApplyOrderServices : BaseServices x.JobId != null).Select(x => x.JobId).ToList();
var reportIds = entitys.Where(x => x.ReportId != null).Select(x => x.ReportId).ToList();
reportIds.AddRange(entitys.Where(x => x.ApplicantId != null).Select(x => x.ApplicantId).ToList());
+ var zoneIds = entitys.Where(x => x.ZoneId != null).Select(x => x.ZoneId).ToList();
+ if (zoneIds.Any())
+ {
+ var zones = await Db.Queryable().Where(x => zoneIds.Contains(x.ZoneID)).ToListAsync();
+
+ entitys.ForEach(rule =>
+ {
+ if (rule.ZoneId != null)
+ rule.ZoneName = zones.FirstOrDefault(o => rule.ZoneId == o.ZoneID)?.ZoneName;
+ });
+ }
if (reportIds.Any())
{
var staffs = await Db.Queryable().Where(x => reportIds.Contains(x.StaffID)).ToListAsync();
@@ -298,7 +309,7 @@ public class Ghrh_OfferApplyOrderServices : BaseServices x.ResumeId == resumeId);
if (applyOrder != null)
{
-
+
obj.CompanyId = applyOrder.CompanyId;
obj.DeptId = applyOrder.DeptId;
obj.TitleId = applyOrder.TitleId;
@@ -309,7 +320,7 @@ public class Ghrh_OfferApplyOrderServices : BaseServices