diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 5a37d00d..71fde2c9 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -4815,7 +4815,7 @@ 开班形式 - + 培训计划 @@ -4840,6 +4840,16 @@ 反馈单ID + + + 开班负责人ID + + + + + 讲师ID + + 培训地点 @@ -4865,14 +4875,29 @@ 报名结束日期 + + + 开班人数 + + + + + 课时数 + + 评估方式 - + - 学员群组 + 评估方式2 + + + + + 学员群组ID @@ -19521,7 +19546,7 @@ 开班形式 - + 培训计划 @@ -19546,6 +19571,16 @@ 反馈单ID + + + 开班负责人ID + + + + + 讲师ID + + 培训地点 @@ -19571,14 +19606,29 @@ 报名结束日期 + + + 开班人数 + + + + + 课时数 + + 评估方式 - + + + 评估方式2 + + + - 学员群组 + 学员群组ID @@ -29752,6 +29802,36 @@ 修改信息 + + + 关联课程/场景 + + + + + 开班起止日期 + + + + + 报名起止日期 + + + + + 试卷 + + + + + 开班负责人 + + + + + 讲师 + + 开班打卡(Dto.View1) diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs index 396b0e08..4834e372 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/2/10 13:58:38 SimonHsiao 初版 +*V0.01 2025/2/10 15:00:24 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -50,7 +50,7 @@ public class Ghre_OpenClassBase /// /// 培训计划 /// - public long? PanId { get; set; } + public long? PlanId { get; set; } /// /// 关联类型 @@ -73,6 +73,16 @@ public class Ghre_OpenClassBase /// public long? FeedbackId { get; set; } + /// + /// 开班负责人ID + /// + public int? ManagerId { get; set; } + + /// + /// 讲师ID + /// + public int? TeacherId { get; set; } + /// /// 培训地点 /// @@ -99,15 +109,32 @@ public class Ghre_OpenClassBase /// public DateTime? RegisterEndTime { get; set; } + /// + /// 开班人数 + /// + public int? StudentCount { get; set; } + + /// + /// 课时数 + /// + [Display(Name = "StandardHour"), Description("课时数"), Column(TypeName = "decimal(20,2)")] + public decimal? StandardHour { get; set; } + /// /// 评估方式 /// - public long? ScoringMethod { get; set; } + [Display(Name = "ScoringMethod"), Description("评估方式"), MaxLength(32, ErrorMessage = "评估方式 不能超过 32 个字符")] + public string ScoringMethod { get; set; } + + /// + /// 评估方式2 + /// + public long? ScoringMethodId { get; set; } /// - /// 学员群组 + /// 学员群组ID /// - public long? StaffGroup { get; set; } + public long? StaffGroupId { get; set; } /// /// 开班通知内容 diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs index 24f0fdc6..b4797440 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/2/10 13:58:38 SimonHsiao 初版 +*V0.01 2025/2/10 15:00:24 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -51,7 +51,7 @@ public class Ghre_OpenClass : BasePoco /// /// 培训计划 /// - public long? PanId { get; set; } + public long? PlanId { get; set; } /// /// 关联类型 @@ -74,6 +74,16 @@ public class Ghre_OpenClass : BasePoco /// public long? FeedbackId { get; set; } + /// + /// 开班负责人ID + /// + public int? ManagerId { get; set; } + + /// + /// 讲师ID + /// + public int? TeacherId { get; set; } + /// /// 培训地点 /// @@ -100,15 +110,32 @@ public class Ghre_OpenClass : BasePoco /// public DateTime? RegisterEndTime { get; set; } + /// + /// 开班人数 + /// + public int? StudentCount { get; set; } + + /// + /// 课时数 + /// + [Display(Name = "StandardHour"), Description("课时数"), Column(TypeName = "decimal(20,2)")] + public decimal? StandardHour { get; set; } + /// /// 评估方式 /// - public long? ScoringMethod { get; set; } + [Display(Name = "ScoringMethod"), Description("评估方式"), MaxLength(32, ErrorMessage = "评估方式 不能超过 32 个字符")] + public string ScoringMethod { get; set; } + + /// + /// 评估方式2 + /// + public long? ScoringMethodId { get; set; } /// - /// 学员群组 + /// 学员群组ID /// - public long? StaffGroup { get; set; } + public long? StaffGroupId { get; set; } /// /// 开班通知内容 diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs index 7ec0f08c..0be2a734 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs @@ -31,4 +31,36 @@ public class Ghre_OpenClassDto : Ghre_OpenClass /// 修改信息 /// public string UpdateDataInfo { get; set; } + + /// + /// 关联课程/场景 + /// + public string CourseOrSceneName { get; set; } + + /// + /// 开班起止日期 + /// + public string StartEndTime { get; set; } + + + /// + /// 报名起止日期 + /// + public string RegisterStartEndTime { get; set; } + + /// + /// 试卷 + /// + public string ExamPaperName { get; set; } + + /// + /// 开班负责人 + /// + public string ManagerName { get; set; } + + /// + /// 讲师 + /// + public string TeacherName { get; set; } } + diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs index 4988feec..770dc834 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs @@ -13,6 +13,65 @@ public class Ghre_OpenClassServices : BaseServices> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) + { + + if (filter.jsonParam != null) + foreach (JProperty jProperty in filter.jsonParam.Properties()) + { + var name = jProperty.Name; + var value = jProperty.Value.ToString(); + if (name == "StartEndTime") + { + var jsonParam = JsonHelper.JsonToObj(value); + + if (jsonParam.columnValue != null) + { + var ids1 = JsonHelper.JsonToObj>(jsonParam.columnValue.ToString()); + + condition += $" AND ((StartTime>='{ids1[0]} 00:00:00' AND StartTime<='{ids1[1]} 23:59:59')"; + condition += $" OR (EndTime>='{ids1[0]} 00:00:00' AND EndTime<='{ids1[1]} 23:59:59'))"; + } + } + + } + + var result = await base.QueryFilterPage(filter, condition, IsEnable); + + for (int i = 0; i < result.result.DT_TableDataT1.Count; i++) + { + var DT_TableDataT1 = result.result.DT_TableDataT1[i]; + + DT_TableDataT1.OpenClassType = await GetParaLabel("TrainingOpenClassType", result.result.DT_TableDataT1[i].OpenClassType); + DT_TableDataT1.OpenClassWay = await GetParaLabel("TrainingOpenClassWay", result.result.DT_TableDataT1[i].OpenClassWay); + DT_TableDataT1.ScoringMethod = await GetParaLabel("ScoreMethod", result.result.DT_TableDataT1[i].ScoringMethod); + + if (DT_TableDataT1.LinkType == "Course") + DT_TableDataT1.CourseOrSceneName = (await Db.Queryable().FirstAsync(x => x.Id == DT_TableDataT1.LinkId))?.CourseName; + else + DT_TableDataT1.CourseOrSceneName = (await Db.Queryable().FirstAsync(x => x.Id == DT_TableDataT1.LinkId))?.SceneName; + + if (DT_TableDataT1.StartTime != null && DT_TableDataT1.EndTime != null) + DT_TableDataT1.StartEndTime = $"{DateTimeHelper.ConvertToMiniuteString(DT_TableDataT1.StartTime)}~{DateTimeHelper.ConvertToMiniuteString(DT_TableDataT1.EndTime)}"; + + if (DT_TableDataT1.RegisterStartTime != null && DT_TableDataT1.RegisterEndTime != null) + DT_TableDataT1.RegisterStartEndTime = $"{DateTimeHelper.ConvertToMiniuteString(DT_TableDataT1.RegisterStartTime)}~{DateTimeHelper.ConvertToMiniuteString(DT_TableDataT1.RegisterEndTime)}"; + + if (DT_TableDataT1.ExamPaperId != null) + DT_TableDataT1.ExamPaperName = (await Db.Queryable().FirstAsync(x => x.Id == DT_TableDataT1.ExamPaperId))?.PaperName; + + + if (DT_TableDataT1.ManagerId != null) + DT_TableDataT1.ManagerName = (await Db.Queryable().FirstAsync(x => x.StaffID == DT_TableDataT1.ManagerId))?.StaffName; + + if (DT_TableDataT1.TeacherId != null) + DT_TableDataT1.TeacherName = (await Db.Queryable().FirstAsync(x => x.Id == DT_TableDataT1.TeacherId))?.TeacherName; + + result.result.DT_TableDataT1[i] = DT_TableDataT1; + } + return result; + } + public override async Task Add(InsertGhre_OpenClassInput entity) { var result = await base.Add(entity); @@ -24,6 +83,8 @@ public class Ghre_OpenClassServices : BaseServices - + 培训计划 @@ -4840,6 +4840,16 @@ 反馈单ID + + + 开班负责人ID + + + + + 讲师ID + + 培训地点 @@ -4865,14 +4875,29 @@ 报名结束日期 + + + 开班人数 + + + + + 课时数 + + 评估方式 - + - 学员群组 + 评估方式2 + + + + + 学员群组ID @@ -19521,7 +19546,7 @@ 开班形式 - + 培训计划 @@ -19546,6 +19571,16 @@ 反馈单ID + + + 开班负责人ID + + + + + 讲师ID + + 培训地点 @@ -19571,14 +19606,29 @@ 报名结束日期 + + + 开班人数 + + + + + 课时数 + + 评估方式 - + + + 评估方式2 + + + - 学员群组 + 学员群组ID @@ -29752,6 +29802,36 @@ 修改信息 + + + 关联课程/场景 + + + + + 开班起止日期 + + + + + 报名起止日期 + + + + + 试卷 + + + + + 开班负责人 + + + + + 讲师 + + 开班打卡(Dto.View1)