Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

开班页面开发

Browse Source
master
xiaochanghai 4 months ago
parent 5e121289f5
commit 0c492483c4
6 changed files with 329 additions and 22 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 92
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 37
      Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs
  3. 37
      Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs
  4. 32
      Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs
  5. 61
      Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
  6. 92
      Tiobon.Core/Tiobon.Core.Model.xml

92
Tiobon.Core.Api/Tiobon.Core.Model.xml
Unescape View File

@ -4815,7 +4815,7 @@
开班形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.PanId">
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.PlanId">
<summary>
培训计划
</summary>
@ -4840,6 +4840,16 @@
反馈单ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ManagerId">
<summary>
开班负责人ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.TeacherId">
<summary>
讲师ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.Address">
<summary>
培训地点
@ -4865,14 +4875,29 @@
报名结束日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.StudentCount">
<summary>
开班人数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.StandardHour">
<summary>
课时数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ScoringMethod">
<summary>
评估方式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.StaffGroup">
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ScoringMethodId">
<summary>
学员群组
评估方式2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.StaffGroupId">
<summary>
学员群组ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.NoticeContent">
@ -19521,7 +19546,7 @@
开班形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.PanId">
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.PlanId">
<summary>
培训计划
</summary>
@ -19546,6 +19571,16 @@
反馈单ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ManagerId">
<summary>
开班负责人ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.TeacherId">
<summary>
讲师ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.Address">
<summary>
培训地点
@ -19571,14 +19606,29 @@
报名结束日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.StudentCount">
<summary>
开班人数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.StandardHour">
<summary>
课时数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ScoringMethod">
<summary>
评估方式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.StaffGroup">
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ScoringMethodId">
<summary>
评估方式2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.StaffGroupId">
<summary>
学员群组
学员群组ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.NoticeContent">
@ -29752,6 +29802,36 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.CourseOrSceneName">
<summary>
关联课程/场景
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.StartEndTime">
<summary>
开班起止日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.RegisterStartEndTime">
<summary>
报名起止日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.ExamPaperName">
<summary>
试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.ManagerName">
<summary>
开班负责人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.TeacherName">
<summary>
讲师
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttendDto">
<summary>
开班打卡(Dto.View1)

37
Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs
Unescape View File

@ -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
/// <summary>
/// 培训计划
/// </summary>
public long? PanId { get; set; }
public long? PlanId { get; set; }
/// <summary>
/// 关联类型
@ -73,6 +73,16 @@ public class Ghre_OpenClassBase
/// </summary>
public long? FeedbackId { get; set; }
/// <summary>
/// 开班负责人ID
/// </summary>
public int? ManagerId { get; set; }
/// <summary>
/// 讲师ID
/// </summary>
public int? TeacherId { get; set; }
/// <summary>
/// 培训地点
/// </summary>
@ -99,15 +109,32 @@ public class Ghre_OpenClassBase
/// </summary>
public DateTime? RegisterEndTime { get; set; }
/// <summary>
/// 开班人数
/// </summary>
public int? StudentCount { get; set; }
/// <summary>
/// 课时数
/// </summary>
[Display(Name = "StandardHour"), Description("课时数"), Column(TypeName = "decimal(20,2)")]
public decimal? StandardHour { get; set; }
/// <summary>
/// 评估方式
/// </summary>
public long? ScoringMethod { get; set; }
[Display(Name = "ScoringMethod"), Description("评估方式"), MaxLength(32, ErrorMessage = "评估方式 不能超过 32 个字符")]
public string ScoringMethod { get; set; }
/// <summary>
/// 评估方式2
/// </summary>
public long? ScoringMethodId { get; set; }
/// <summary>
/// 学员群组
/// 学员群组ID
/// </summary>
public long? StaffGroup { get; set; }
public long? StaffGroupId { get; set; }
/// <summary>
/// 开班通知内容

37
Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs
Unescape View File

@ -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
/// <summary>
/// 培训计划
/// </summary>
public long? PanId { get; set; }
public long? PlanId { get; set; }
/// <summary>
/// 关联类型
@ -74,6 +74,16 @@ public class Ghre_OpenClass : BasePoco
/// </summary>
public long? FeedbackId { get; set; }
/// <summary>
/// 开班负责人ID
/// </summary>
public int? ManagerId { get; set; }
/// <summary>
/// 讲师ID
/// </summary>
public int? TeacherId { get; set; }
/// <summary>
/// 培训地点
/// </summary>
@ -100,15 +110,32 @@ public class Ghre_OpenClass : BasePoco
/// </summary>
public DateTime? RegisterEndTime { get; set; }
/// <summary>
/// 开班人数
/// </summary>
public int? StudentCount { get; set; }
/// <summary>
/// 课时数
/// </summary>
[Display(Name = "StandardHour"), Description("课时数"), Column(TypeName = "decimal(20,2)")]
public decimal? StandardHour { get; set; }
/// <summary>
/// 评估方式
/// </summary>
public long? ScoringMethod { get; set; }
[Display(Name = "ScoringMethod"), Description("评估方式"), MaxLength(32, ErrorMessage = "评估方式 不能超过 32 个字符")]
public string ScoringMethod { get; set; }
/// <summary>
/// 评估方式2
/// </summary>
public long? ScoringMethodId { get; set; }
/// <summary>
/// 学员群组
/// 学员群组ID
/// </summary>
public long? StaffGroup { get; set; }
public long? StaffGroupId { get; set; }
/// <summary>
/// 开班通知内容

32
Tiobon.Core.Model/View/Ghre/Ghre_OpenClass.Dto.View.cs
Unescape View File

@ -31,4 +31,36 @@ public class Ghre_OpenClassDto : Ghre_OpenClass
/// 修改信息
/// </summary>
public string UpdateDataInfo { get; set; }
/// <summary>
/// 关联课程/场景
/// </summary>
public string CourseOrSceneName { get; set; }
/// <summary>
/// 开班起止日期
/// </summary>
public string StartEndTime { get; set; }
/// <summary>
/// 报名起止日期
/// </summary>
public string RegisterStartEndTime { get; set; }
/// <summary>
/// 试卷
/// </summary>
public string ExamPaperName { get; set; }
/// <summary>
/// 开班负责人
/// </summary>
public string ManagerName { get; set; }
/// <summary>
/// 讲师
/// </summary>
public string TeacherName { get; set; }
}

61
Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
Unescape View File

@ -13,6 +13,65 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
base._caching = caching;
}
public override async Task<ServicePageResult<Ghre_OpenClassDto>> 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<JsonParam>(value);
if (jsonParam.columnValue != null)
{
var ids1 = JsonHelper.JsonToObj<List<string>>(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<Ghre_Course>().FirstAsync(x => x.Id == DT_TableDataT1.LinkId))?.CourseName;
else
DT_TableDataT1.CourseOrSceneName = (await Db.Queryable<Ghre_CourseScene>().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<Ghre_ExamPaper>().FirstAsync(x => x.Id == DT_TableDataT1.ExamPaperId))?.PaperName;
if (DT_TableDataT1.ManagerId != null)
DT_TableDataT1.ManagerName = (await Db.Queryable<Ghra_Staff>().FirstAsync(x => x.StaffID == DT_TableDataT1.ManagerId))?.StaffName;
if (DT_TableDataT1.TeacherId != null)
DT_TableDataT1.TeacherName = (await Db.Queryable<Ghre_Teacher>().FirstAsync(x => x.Id == DT_TableDataT1.TeacherId))?.TeacherName;
result.result.DT_TableDataT1[i] = DT_TableDataT1;
}
return result;
}
public override async Task<long> Add(InsertGhre_OpenClassInput entity)
{
var result = await base.Add(entity);
@ -24,6 +83,8 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
{
var result = await base.Update(Id, editModel, null, ["Status"]);
return result;
}
}

92
Tiobon.Core/Tiobon.Core.Model.xml
Unescape View File

@ -4815,7 +4815,7 @@
开班形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.PanId">
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.PlanId">
<summary>
培训计划
</summary>
@ -4840,6 +4840,16 @@
反馈单ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ManagerId">
<summary>
开班负责人ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.TeacherId">
<summary>
讲师ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.Address">
<summary>
培训地点
@ -4865,14 +4875,29 @@
报名结束日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.StudentCount">
<summary>
开班人数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.StandardHour">
<summary>
课时数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ScoringMethod">
<summary>
评估方式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.StaffGroup">
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ScoringMethodId">
<summary>
学员群组
评估方式2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.StaffGroupId">
<summary>
学员群组ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.NoticeContent">
@ -19521,7 +19546,7 @@
开班形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.PanId">
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.PlanId">
<summary>
培训计划
</summary>
@ -19546,6 +19571,16 @@
反馈单ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ManagerId">
<summary>
开班负责人ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.TeacherId">
<summary>
讲师ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.Address">
<summary>
培训地点
@ -19571,14 +19606,29 @@
报名结束日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.StudentCount">
<summary>
开班人数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.StandardHour">
<summary>
课时数
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ScoringMethod">
<summary>
评估方式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.StaffGroup">
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ScoringMethodId">
<summary>
评估方式2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.StaffGroupId">
<summary>
学员群组
学员群组ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.NoticeContent">
@ -29752,6 +29802,36 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.CourseOrSceneName">
<summary>
关联课程/场景
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.StartEndTime">
<summary>
开班起止日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.RegisterStartEndTime">
<summary>
报名起止日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.ExamPaperName">
<summary>
试卷
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.ManagerName">
<summary>
开班负责人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.TeacherName">
<summary>
讲师
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttendDto">
<summary>
开班打卡(Dto.View1)

Write Preview
Loading…
Cancel
Save