diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Certificate.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Certificate.Dto.Base.cs index 196b681f..423df876 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Certificate.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Certificate.Dto.Base.cs @@ -6,9 +6,9 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/12/25 10:29:10 SimonHsiao 初版 +*V0.01 2025/6/3 10:11:34 SimonHsiao 初版 * -* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ @@ -157,4 +157,10 @@ public class Ghre_CertificateBase /// 预留字段12 /// public int? ReverseI2 { get; set; } + + /// + /// 证书编号 + /// + [Display(Name = "CertificateNo"), Description("证书编号"), MaxLength(32, ErrorMessage = "证书编号 不能超过 32 个字符")] + public string CertificateNo { get; set; } } diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_Certificate.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Certificate.cs index 705dce54..2ac10b4a 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Certificate.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Certificate.cs @@ -6,9 +6,9 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/12/25 10:29:10 SimonHsiao 初版 +*V0.01 2025/6/3 10:11:34 SimonHsiao 初版 * -* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ @@ -20,7 +20,7 @@ namespace Tiobon.Core.Model.Models; /// /// 培训证书 (Model) /// -[SugarTable("Ghre_Certificate", "Ghre_Certificate"), Entity(TableCnName = "Ghre_Certificate", TableName = "Ghre_Certificate")] +[SugarTable("Ghre_Certificate", "Ghre_Certificate"), Entity(TableCnName = "培训证书", TableName = "Ghre_Certificate")] public class Ghre_Certificate : BasePoco { @@ -158,4 +158,10 @@ public class Ghre_Certificate : BasePoco /// 预留字段12 /// public int? ReverseI2 { get; set; } + + /// + /// 证书编号 + /// + [Display(Name = "CertificateNo"), Description("证书编号"), MaxLength(32, ErrorMessage = "证书编号 不能超过 32 个字符")] + public string CertificateNo { get; set; } } diff --git a/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs index ff6ac2f4..e10f82bc 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs @@ -204,10 +204,10 @@ public class Ghre_CertificateRuleServices : BaseServices().Where(x => x.Id == id).FirstAsync(); + certificate = await Db.Queryable().Where(x => x.Id == id).FirstAsync(); staffId = certificate.StaffId; studyRecordId = certificate.Reverse1.IsNotEmptyOrNull() ? certificate.Reverse1.ObjToLong() : null; result = await base.QueryById(certificate.CertificateRuleId); @@ -256,10 +256,15 @@ public class Ghre_CertificateRuleServices : BaseServices + + + 证书编号 + + Ghre_CertificateDesign (Dto.Base) @@ -22277,6 +22282,11 @@ 预留字段12 + + + 证书编号 + + Ghre_CertificateDesign (Model)