diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm
index a8bb3bb1..9d610431 100644
--- a/Model/Tiobon.Web.pdm
+++ b/Model/Tiobon.Web.pdm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1741256407" Name="Tiobon" Objects="3607" Symbols="163" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
+<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1741256407" Name="Tiobon" Objects="3600" Symbols="137" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -10350,7 +10350,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o70">
 <a:CreationDate>1727335554</a:CreationDate>
 <a:ModificationDate>1727335611</a:ModificationDate>
-<a:Rect>((-51600,11212), (-40800,12733))</a:Rect>
+<a:Rect>((-51600,11212), (-40800,12683))</a:Rect>
 <a:ListOfPoints>((-51600,11437),(-40800,11437))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -10572,7 +10572,7 @@ Shadow=0</a:DisplayPreferences>
 <a:CreationDate>1741251792</a:CreationDate>
 <a:ModificationDate>1741256407</a:ModificationDate>
 <a:CenterTextOffset>(-75, 2100)</a:CenterTextOffset>
-<a:Rect>((44033,-9975), (52208,-6403))</a:Rect>
+<a:Rect>((44033,-9975), (52208,-6315))</a:Rect>
 <a:ListOfPoints>((52208,-9750),(44033,-9750))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index ec381b44..d6ef99bb 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -7650,26 +7650,11 @@
             备注
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ApplyReason">
-            <summary>
-            申请理由
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.IsDefault">
             <summary>
             默认标志
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.SponsorId">
-            <summary>
-            发起人
-            </summary>
-        </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.WorkID">
             <summary>
             WorkID
@@ -7805,6 +7790,31 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ApplyReason">
+            <summary>
+            申请理由
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.SponsorId">
+            <summary>
+            发起人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.EffectiveDate">
+            <summary>
+            生效日期
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ExpirationDate">
+            <summary>
+            失效日期
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_TeacherAttachmentBase">
             <summary>
             Ghre_TeacherAttachment (Dto.Base)
@@ -23141,26 +23151,11 @@
             备注
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ApplyReason">
-            <summary>
-            申请理由
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.IsDefault">
             <summary>
             默认标志
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.SponsorId">
-            <summary>
-            发起人
-            </summary>
-        </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.WorkID">
             <summary>
             WorkID
@@ -23296,6 +23291,31 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ApplyReason">
+            <summary>
+            申请理由
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.SponsorId">
+            <summary>
+            发起人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.EffectiveDate">
+            <summary>
+            生效日期
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ExpirationDate">
+            <summary>
+            失效日期
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_TeacherAttachment">
             <summary>
             Ghre_TeacherAttachment (Model)
diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs
index cf74d2a6..b1aefdb0 100644
--- a/Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs
@@ -6,9 +6,9 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/9/24 10:53:13  SimonHsiao   初版
+*V0.01  2025/3/7 11:21:46  SimonHsiao   初版
 *
-* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
+* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
@@ -104,28 +104,11 @@ public class Ghre_TeacherBase
     [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
     public string RemarkSz { get; set; }
 
-    /// <summary>
-    /// 申请理由
-    /// </summary>
-    [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")]
-    public string ApplyReason { get; set; }
-
     /// <summary>
     /// 默认标志
     /// </summary>
     public int? IsDefault { get; set; }
 
-    /// <summary>
-    /// 发起人
-    /// </summary>
-    public long? SponsorId { get; set; }
-
-    /// <summary>
-    /// 状态
-    /// </summary>
-    [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
-    public string Status { get; set; }
-
     /// <summary>
     /// WorkID
     /// </summary>
@@ -276,4 +259,31 @@ public class Ghre_TeacherBase
     /// 预留字段12
     /// </summary>
     public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
+    public string Status { get; set; }
+
+    /// <summary>
+    /// 申请理由
+    /// </summary>
+    [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")]
+    public string ApplyReason { get; set; }
+
+    /// <summary>
+    /// 发起人
+    /// </summary>
+    public int? SponsorId { get; set; }
+
+    /// <summary>
+    /// 生效日期
+    /// </summary>
+    public DateTime? EffectiveDate { get; set; }
+
+    /// <summary>
+    /// 失效日期
+    /// </summary>
+    public DateTime? ExpirationDate { get; set; }
 }
diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs
index c348988e..e2a5a68a 100644
--- a/Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs
+++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs
@@ -6,9 +6,9 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/9/24 10:53:13  SimonHsiao   初版
+*V0.01  2025/3/7 11:21:46  SimonHsiao   初版
 *
-* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
+* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
@@ -105,28 +105,11 @@ public class Ghre_Teacher : BasePoco
     [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
     public string RemarkSz { get; set; }
 
-    /// <summary>
-    /// 申请理由
-    /// </summary>
-    [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")]
-    public string ApplyReason { get; set; }
-
     /// <summary>
     /// 默认标志
     /// </summary>
     public int? IsDefault { get; set; }
 
-    /// <summary>
-    /// 发起人
-    /// </summary>
-    public long? SponsorId { get; set; }
-
-    /// <summary>
-    /// 状态
-    /// </summary>
-    [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
-    public string Status { get; set; }
-
     /// <summary>
     /// WorkID
     /// </summary>
@@ -277,4 +260,31 @@ public class Ghre_Teacher : BasePoco
     /// 预留字段12
     /// </summary>
     public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
+    public string Status { get; set; }
+
+    /// <summary>
+    /// 申请理由
+    /// </summary>
+    [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")]
+    public string ApplyReason { get; set; }
+
+    /// <summary>
+    /// 发起人
+    /// </summary>
+    public int? SponsorId { get; set; }
+
+    /// <summary>
+    /// 生效日期
+    /// </summary>
+    public DateTime? EffectiveDate { get; set; }
+
+    /// <summary>
+    /// 失效日期
+    /// </summary>
+    public DateTime? ExpirationDate { get; set; }
 }
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
index af66babf..4647a0e1 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
@@ -936,6 +936,10 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 editable = true
             }
         };
+
+        var companyCode = await QueryCompanyCode();
+        if (companyCode == "Viavi")
+            baseColumns = baseColumns.Where(x => x.field != "ExamMode1").ToList();
         #endregion
 
         #region staffTableColumns 
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index ec381b44..d6ef99bb 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -7650,26 +7650,11 @@
             备注
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ApplyReason">
-            <summary>
-            申请理由
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.IsDefault">
             <summary>
             默认标志
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.SponsorId">
-            <summary>
-            发起人
-            </summary>
-        </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.WorkID">
             <summary>
             WorkID
@@ -7805,6 +7790,31 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ApplyReason">
+            <summary>
+            申请理由
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.SponsorId">
+            <summary>
+            发起人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.EffectiveDate">
+            <summary>
+            生效日期
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ExpirationDate">
+            <summary>
+            失效日期
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_TeacherAttachmentBase">
             <summary>
             Ghre_TeacherAttachment (Dto.Base)
@@ -23141,26 +23151,11 @@
             备注
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ApplyReason">
-            <summary>
-            申请理由
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.IsDefault">
             <summary>
             默认标志
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.SponsorId">
-            <summary>
-            发起人
-            </summary>
-        </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.WorkID">
             <summary>
             WorkID
@@ -23296,6 +23291,31 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ApplyReason">
+            <summary>
+            申请理由
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.SponsorId">
+            <summary>
+            发起人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.EffectiveDate">
+            <summary>
+            生效日期
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ExpirationDate">
+            <summary>
+            失效日期
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_TeacherAttachment">
             <summary>
             Ghre_TeacherAttachment (Model)