录用审批新增厂区、员工类别1

Tiobon.Core.Api/Tiobon.Core.Model.xml

@@ -8245,6 +8245,11 @@
             计薪类别ID
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_OfferApplyOrderBase.ZoneId">
+            <summary>
+            厂区ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_OfferApplyOrderSalaryBase">
             <summary>
             录用审批单薪资 (Dto.Base)
@@ -21891,6 +21896,11 @@
             计薪类别ID
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_OfferApplyOrder.ZoneId">
+            <summary>
+            厂区ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_OfferApplyOrderSalary">
             <summary>
             录用审批单薪资 (Model)
@@ -28027,6 +28037,11 @@
             审批状态
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_OfferApplyOrderDto.ZoneName">
+            <summary>
+            厂区
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_OfferApplyOrderSalaryDto">
             <summary>
             录用审批单薪资(Dto.View1)

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; }
 
+    /// <summary>
+    /// 员工类别1
+    /// </summary>
+    [Display(Name = "StaffType1"), Description("员工类别1"), MaxLength(32, ErrorMessage = "员工类别1 不能超过 32 个字符")]
+    public string StaffType1 { get; set; }
+
     /// <summary>
     /// 职等
     /// </summary>
@@ -298,4 +304,9 @@ public class Ghrh_OfferApplyOrderBase
     /// 计薪类别ID
     /// </summary>
     public int? PeriodMasterId { get; set; }
+
+    /// <summary>
+    /// 厂区ID
+    /// </summary>
+    public int? ZoneId { get; set; }
 }

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; }
 
+    /// <summary>
+    /// 员工类别1
+    /// </summary>
+    [Display(Name = "StaffType1"), Description("员工类别1"), MaxLength(32, ErrorMessage = "员工类别1 不能超过 32 个字符")]
+    public string StaffType1 { get; set; }
+
     /// <summary>
     /// 职等
     /// </summary>
@@ -299,4 +305,9 @@ public class Ghrh_OfferApplyOrder : BasePoco
     /// 计薪类别ID
     /// </summary>
     public int? PeriodMasterId { get; set; }
+
+    /// <summary>
+    /// 厂区ID
+    /// </summary>
+    public int? ZoneId { get; set; }
 }

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; }
+
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    public string ZoneName { get; set; }
+
     
+
 }

Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs

@@ -43,7 +43,18 @@ public class Ghrh_OfferApplyOrderServices : BaseServices<Ghrh_OfferApplyOrder, G
         var jobIds = entitys.Where(x => 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<Ghra_Zone>().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<Ghra_Staff>().Where(x => reportIds.Contains(x.StaffID)).ToListAsync();
@@ -298,7 +309,7 @@ public class Ghrh_OfferApplyOrderServices : BaseServices<Ghrh_OfferApplyOrder, G
         var applyOrder = await base.QuerySingle(x => 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<Ghrh_OfferApplyOrder, G
             obj.StaffType = applyOrder.StaffType;
             obj.GradeId = applyOrder.GradeId;
             obj.PeriodMasterId = applyOrder.PeriodMasterId;
-            obj.JobId = applyOrder.JobId; 
+            obj.JobId = applyOrder.JobId;
             obj.ProbationMonths = applyOrder.ProbationMonths;
             obj.ReportId = applyOrder.ReportId;
             obj.JobResponsibility = applyOrder.JobResponsibility;