diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 65d70840..d239a648 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -13888,7 +13888,7 @@ LABL 0 Arial Unicode MS,8,N Ghre_Course 1713839845 Administrator -1740024007 +1740626894 Administrator 课程 @@ -14051,17 +14051,6 @@ LABL 0 Arial Unicode MS,8,N 64 -C7365459-E3F3-49CA-8372-60D1FCEDF4A0 -课程分类ID2 -CourseClassId2 -1717723947 -Administrator -1717723991 -Administrator -课程分类ID -bigint - - 1335D331-DAA5-4CD0-9A46-A58317A9F23F 课程分类ID CourseClassId @@ -14073,6 +14062,18 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 + +C7365459-E3F3-49CA-8372-60D1FCEDF4A0 +课程分类2 +CourseClass2 +1717723947 +Administrator +1740627216 +Administrator +课程分类2 +nvarchar(32) +32 + 7A5BBC82-D331-4B1E-9332-138AA3B4BC05 课程场景ID @@ -51813,7 +51814,7 @@ Ghra_staff_InsureBase - + diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 28e3c53b..63286340 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -2895,6 +2895,11 @@ 预留字段12 + + + 课程分类2 + + 课程分类 (Dto.Base) @@ -17981,6 +17986,11 @@ 预留字段12 + + + 课程分类2 + + 课程分类 (Model) diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Course.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Course.Dto.Base.cs index f94625a6..c7c17f55 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Course.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Course.Dto.Base.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/2/6 14:16:52 SimonHsiao 初版 +*V0.01 2025/2/27 11:34:49 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -263,4 +263,10 @@ public class Ghre_CourseBase /// 预留字段12 /// public int? ReverseI2 { get; set; } + + /// + /// 课程分类2 + /// + [Display(Name = "CourseClass2"), Description("课程分类2"), MaxLength(32, ErrorMessage = "课程分类2 不能超过 32 个字符")] + public string CourseClass2 { get; set; } } diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs index 4b0e7b3e..7f0ee009 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/2/6 14:16:52 SimonHsiao 初版 +*V0.01 2025/2/27 11:34:49 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -264,4 +264,10 @@ public class Ghre_Course : BasePoco /// 预留字段12 /// public int? ReverseI2 { get; set; } + + /// + /// 课程分类2 + /// + [Display(Name = "CourseClass2"), Description("课程分类2"), MaxLength(32, ErrorMessage = "课程分类2 不能超过 32 个字符")] + public string CourseClass2 { get; set; } } diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs index e407a83c..57c666db 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs @@ -167,6 +167,7 @@ public class Ghre_CourseServices : BaseServices { x.ChargeMethodLabel = await GetParaLabel("CourseChargeMethod", x.ChargeMethod); + x.CourseClass2 = await GetParaLabel("TrainingCourseClass2", x.ChargeMethod); x.InOrOutLabel = await GetParaLabel("CourseInOrOut", x.InOrOut); x.IsOPenLabel = x.IsOpen == "1" ? "是" : "否"; var courseClass = classs.Where(a => x.CourseClassId.Contains(a.Id.ToString())).ToList(); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 28e3c53b..63286340 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -2895,6 +2895,11 @@ 预留字段12 + + + 课程分类2 + + 课程分类 (Dto.Base) @@ -17981,6 +17986,11 @@ 预留字段12 + + + 课程分类2 + + 课程分类 (Model)