From 6e739b6412630c22214f2c75daea1bc470769602 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Fri, 7 Mar 2025 12:01:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=BB=B4=E6=8A=A4=E2=80=94?= =?UTF-8?q?=E2=80=94=E9=9C=80=E8=A6=81=E8=AE=BE=E5=AE=9A=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=9C=9F=EF=BC=88=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=9C=9F=E8=B5=B7=E3=80=81=E6=9C=89=E6=95=88=E6=9C=9F?= =?UTF-8?q?=E8=AE=AB=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 6 +- Tiobon.Core.Api/Tiobon.Core.Model.xml | 80 ++++++++++++------- .../Base/Ghre/Ghre_Teacher.Dto.Base.cs | 48 ++++++----- Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs | 48 ++++++----- .../Ghre/Ghre_ExamServices.cs | 4 + Tiobon.Core/Tiobon.Core.Model.xml | 80 ++++++++++++------- 6 files changed, 165 insertions(+), 101 deletions(-) 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 @@ - + @@ -10350,7 +10350,7 @@ Shadow=0 1727335554 1727335611 -((-51600,11212), (-40800,12733)) +((-51600,11212), (-40800,12683)) ((-51600,11437),(-40800,11437)) 2 1 @@ -10572,7 +10572,7 @@ Shadow=0 1741251792 1741256407 (-75, 2100) -((44033,-9975), (52208,-6403)) +((44033,-9975), (52208,-6315)) ((52208,-9750),(44033,-9750)) 2 1 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 @@ 备注 - - - 申请理由 - - 默认标志 - - - 发起人 - - - - - 状态 - - WorkID @@ -7805,6 +7790,31 @@ 预留字段12 + + + 状态 + + + + + 申请理由 + + + + + 发起人 + + + + + 生效日期 + + + + + 失效日期 + + Ghre_TeacherAttachment (Dto.Base) @@ -23141,26 +23151,11 @@ 备注 - - - 申请理由 - - 默认标志 - - - 发起人 - - - - - 状态 - - WorkID @@ -23296,6 +23291,31 @@ 预留字段12 + + + 状态 + + + + + 申请理由 + + + + + 发起人 + + + + + 生效日期 + + + + + 失效日期 + + 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; } - /// - /// 申请理由 - /// - [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")] - public string ApplyReason { get; set; } - /// /// 默认标志 /// public int? IsDefault { get; set; } - /// - /// 发起人 - /// - public long? SponsorId { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - /// /// WorkID /// @@ -276,4 +259,31 @@ public class Ghre_TeacherBase /// 预留字段12 /// public int? ReverseI2 { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 申请理由 + /// + [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")] + public string ApplyReason { get; set; } + + /// + /// 发起人 + /// + public int? SponsorId { get; set; } + + /// + /// 生效日期 + /// + public DateTime? EffectiveDate { get; set; } + + /// + /// 失效日期 + /// + 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; } - /// - /// 申请理由 - /// - [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")] - public string ApplyReason { get; set; } - /// /// 默认标志 /// public int? IsDefault { get; set; } - /// - /// 发起人 - /// - public long? SponsorId { get; set; } - - /// - /// 状态 - /// - [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] - public string Status { get; set; } - /// /// WorkID /// @@ -277,4 +260,31 @@ public class Ghre_Teacher : BasePoco /// 预留字段12 /// public int? ReverseI2 { get; set; } + + /// + /// 状态 + /// + [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")] + public string Status { get; set; } + + /// + /// 申请理由 + /// + [Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")] + public string ApplyReason { get; set; } + + /// + /// 发起人 + /// + public int? SponsorId { get; set; } + + /// + /// 生效日期 + /// + public DateTime? EffectiveDate { get; set; } + + /// + /// 失效日期 + /// + 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 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 @@ 备注 - - - 申请理由 - - 默认标志 - - - 发起人 - - - - - 状态 - - WorkID @@ -7805,6 +7790,31 @@ 预留字段12 + + + 状态 + + + + + 申请理由 + + + + + 发起人 + + + + + 生效日期 + + + + + 失效日期 + + Ghre_TeacherAttachment (Dto.Base) @@ -23141,26 +23151,11 @@ 备注 - - - 申请理由 - - 默认标志 - - - 发起人 - - - - - 状态 - - WorkID @@ -23296,6 +23291,31 @@ 预留字段12 + + + 状态 + + + + + 申请理由 + + + + + 发起人 + + + + + 生效日期 + + + + + 失效日期 + + Ghre_TeacherAttachment (Model)