diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 80de0962..6e67adf2 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -3735,6 +3735,16 @@ 规则种类 + + + 学习完成 + + + + + 考试合格 + + 分数段规则 @@ -20617,6 +20627,16 @@ 规则种类 + + + 学习完成 + + + + + 考试合格 + + 分数段规则 diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_CreditRule.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_CreditRule.Dto.Base.cs index 352ea0fd..7d51da19 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_CreditRule.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_CreditRule.Dto.Base.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/7 15:56:18 SimonHsiao 初版 +*V0.01 2025/4/8 15:17:40 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -41,6 +41,16 @@ public class Ghre_CreditRuleBase [Display(Name = "RuleType"), Description("规则种类"), MaxLength(32, ErrorMessage = "规则种类 不能超过 32 个字符")] public string RuleType { get; set; } + /// + /// 学习完成 + /// + public int? StudyCompletedPercent { get; set; } + + /// + /// 考试合格 + /// + public int? ExamPassPercent { get; set; } + /// /// 分数段规则 /// diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_CreditRule.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CreditRule.cs index f570594b..946ac590 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CreditRule.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CreditRule.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/7 15:56:18 SimonHsiao 初版 +*V0.01 2025/4/8 15:17:40 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -42,6 +42,16 @@ public class Ghre_CreditRule : BasePoco [Display(Name = "RuleType"), Description("规则种类"), MaxLength(32, ErrorMessage = "规则种类 不能超过 32 个字符")] public string RuleType { get; set; } + /// + /// 学习完成 + /// + public int? StudyCompletedPercent { get; set; } + + /// + /// 考试合格 + /// + public int? ExamPassPercent { get; set; } + /// /// 分数段规则 /// diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index ffbc4106..aa0b3aad 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -1832,6 +1832,7 @@ public partial class CommonServices : BaseServices>, ICommon //} break; case "F_OfferTemplate": + case "F_CreditRule": toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault(); if (toolbar != null) toolbar.fnKey = "TBD1YN"; toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault(); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 80de0962..6e67adf2 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -3735,6 +3735,16 @@ 规则种类 + + + 学习完成 + + + + + 考试合格 + + 分数段规则 @@ -20617,6 +20627,16 @@ 规则种类 + + + 学习完成 + + + + + 考试合格 + + 分数段规则