From 870125a30bd0117860ddfe6698fa4e9ccd8aca2b Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Tue, 28 May 2024 18:13:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=80=83=E8=AF=95=E3=80=81?= =?UTF-8?q?=E8=80=83=E8=AF=95=E4=BA=BA=E5=91=98=E5=9F=BA=E7=A1=80=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Ghre/Ghre_ExamController.cs | 2 +- Tiobon.Core.Api/Tiobon.Core.Model.xml | 30 +++++++++++++++---- Tiobon.Core.Api/Tiobon.Core.xml | 2 +- .../Ghre/IGhre_ExamServices.cs | 14 ++++----- .../Base/Ghre/Ghre_Exam.Dto.Base.cs | 16 ++++++++-- .../Edit/Ghre/Ghre_Exam.Dto.EditInput.cs | 4 +-- .../Insert/Ghre/Ghre_Exam.Dto.InsertInput.cs | 4 +-- Tiobon.Core.Model/Models/Ghre/Ghre_Exam.cs | 18 +++++++++-- .../View/Ghre/Ghre_Exam.Dto.View.cs | 4 +-- .../Ghre/Ghre_ExamServices.cs | 4 +-- Tiobon.Core/Tiobon.Core.Model.xml | 30 +++++++++++++++---- Tiobon.Core/Tiobon.Core.xml | 2 +- 12 files changed, 96 insertions(+), 34 deletions(-) diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamController.cs index 78b4576f..82773688 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamController.cs @@ -1,7 +1,7 @@ namespace Tiobon.Core.Api.Controllers; /// -/// Ghre_Exam(Controller) +/// 考试(Controller) /// [Route("api/[controller]")] [ApiController, GlobalActionFilter] diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 65d91378..9b11e04e 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -807,7 +807,7 @@ - Ghre_Exam (Dto.Base) + 考试 (Dto.Base) @@ -830,11 +830,21 @@ 试卷ID + + + 封面图片URL + + 考试编号 + + + 考试名称 + + 日期类型 @@ -1941,7 +1951,7 @@ - Ghre_Exam (Dto.EditInput) + 考试 (Dto.EditInput) @@ -2026,7 +2036,7 @@ - Ghre_Exam (Dto.InsertInput) + 考试 (Dto.InsertInput) @@ -3045,7 +3055,7 @@ - Ghre_Exam (Model) + 考试 (Model) @@ -3068,11 +3078,21 @@ 试卷ID + + + 封面图片URL + + 考试编号 + + + 考试名称 + + 日期类型 @@ -5048,7 +5068,7 @@ - Ghre_Exam(Dto.View) + 考试(Dto.View) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index 58565c66..a577e587 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -581,7 +581,7 @@ - Ghre_Exam(Controller) + 考试(Controller) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs index 0fe3af96..37373246 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs @@ -3,12 +3,12 @@ using Tiobon.Core.Model; using Tiobon.Core.Model.Models; namespace Tiobon.Core.IServices -{ - /// - /// Ghre_Exam(自定义服务接口) - /// - public interface IGhre_ExamServices :IBaseServices - { - dynamic GetModuleInfo(ModuleParam param); +{ + /// + /// 考试(自定义服务接口) + /// + public interface IGhre_ExamServices : IBaseServices + { + dynamic GetModuleInfo(ModuleParam param); } } \ No newline at end of file diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Exam.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Exam.Dto.Base.cs index 4240ce15..171854ed 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Exam.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Exam.Dto.Base.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/5/28 14:28:16 SimonHsiao 初版 +*V0.01 2024/5/28 18:09:05 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -21,7 +21,7 @@ namespace Tiobon.Core.Model.Models { /// - /// Ghre_Exam (Dto.Base) + /// 考试 (Dto.Base) /// public class Ghre_ExamBase { @@ -47,12 +47,24 @@ namespace Tiobon.Core.Model.Models /// public long? ExamPaperId { get; set; } + /// + /// 封面图片URL + /// + [Display(Name = "CoverUrl"), Description("封面图片URL"), MaxLength(256, ErrorMessage = "封面图片URL 不能超过 256 个字符")] + public string CoverUrl { get; set; } + /// /// 考试编号 /// [Display(Name = "ExamNo"), Description("考试编号"), MaxLength(32, ErrorMessage = "考试编号 不能超过 32 个字符")] public string ExamNo { get; set; } + /// + /// 考试名称 + /// + [Display(Name = "ExamName"), Description("考试名称"), MaxLength(32, ErrorMessage = "考试名称 不能超过 32 个字符")] + public string ExamName { get; set; } + /// /// 日期类型 /// diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_Exam.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_Exam.Dto.EditInput.cs index d993f88e..f14ba94e 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_Exam.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_Exam.Dto.EditInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/5/28 14:28:16 SimonHsiao 初版 +*V0.01 2024/5/28 18:09:05 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -19,7 +19,7 @@ namespace Tiobon.Core.Model.Models { /// - /// Ghre_Exam (Dto.EditInput) + /// 考试 (Dto.EditInput) /// public class EditGhre_ExamInput : Ghre_ExamBase { diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_Exam.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_Exam.Dto.InsertInput.cs index 90dda024..2abbf85a 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_Exam.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_Exam.Dto.InsertInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/5/28 14:28:16 SimonHsiao 初版 +*V0.01 2024/5/28 18:09:05 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -19,7 +19,7 @@ namespace Tiobon.Core.Model.Models { /// - /// Ghre_Exam (Dto.InsertInput) + /// 考试 (Dto.InsertInput) /// public class InsertGhre_ExamInput : Ghre_ExamBase { diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_Exam.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Exam.cs index b0b2a094..6573b13f 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Exam.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Exam.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/5/28 14:28:16 SimonHsiao 初版 +*V0.01 2024/5/28 18:09:05 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -22,9 +22,9 @@ namespace Tiobon.Core.Model.Models { /// - /// Ghre_Exam (Model) + /// 考试 (Model) /// - [SugarTable("Ghre_Exam", "Ghre_Exam"), Entity(TableCnName = "Ghre_Exam", TableName = "Ghre_Exam")] + [SugarTable("Ghre_Exam", "Ghre_Exam"), Entity(TableCnName = "考试", TableName = "Ghre_Exam")] public class Ghre_Exam : BasePoco { @@ -49,12 +49,24 @@ namespace Tiobon.Core.Model.Models /// public long? ExamPaperId { get; set; } + /// + /// 封面图片URL + /// + [Display(Name = "CoverUrl"), Description("封面图片URL"), MaxLength(256, ErrorMessage = "封面图片URL 不能超过 256 个字符")] + public string CoverUrl { get; set; } + /// /// 考试编号 /// [Display(Name = "ExamNo"), Description("考试编号"), MaxLength(32, ErrorMessage = "考试编号 不能超过 32 个字符")] public string ExamNo { get; set; } + /// + /// 考试名称 + /// + [Display(Name = "ExamName"), Description("考试名称"), MaxLength(32, ErrorMessage = "考试名称 不能超过 32 个字符")] + public string ExamName { get; set; } + /// /// 日期类型 /// diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_Exam.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_Exam.Dto.View.cs index f411b802..c3523d97 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_Exam.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_Exam.Dto.View.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/5/28 14:28:16 SimonHsiao 初版 +*V0.01 2024/5/28 18:09:05 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -18,7 +18,7 @@ namespace Tiobon.Core.Model.Models; /// -/// Ghre_Exam(Dto.View) +/// 考试(Dto.View) /// public class Ghre_ExamDto : Ghre_Exam { diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs index b4278a4d..2c0b60be 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs @@ -5,9 +5,7 @@ using Tiobon.Core.Services.BASE; using Tiobon.Core.IRepository.Base; using Tiobon.Core.Common.Caches; using System.Dynamic; -using Newtonsoft.Json.Linq; using Tiobon.Core.Model; -using System.Data; using Tiobon.Core.Common; using AgileObjects.AgileMapper; using Newtonsoft.Json; @@ -15,7 +13,7 @@ using Newtonsoft.Json; namespace Tiobon.Core.Services; /// -/// Ghre_Exam (服务) +/// 考试 (服务) /// public class Ghre_ExamServices : BaseServices, IGhre_ExamServices { diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 65d91378..9b11e04e 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -807,7 +807,7 @@ - Ghre_Exam (Dto.Base) + 考试 (Dto.Base) @@ -830,11 +830,21 @@ 试卷ID + + + 封面图片URL + + 考试编号 + + + 考试名称 + + 日期类型 @@ -1941,7 +1951,7 @@ - Ghre_Exam (Dto.EditInput) + 考试 (Dto.EditInput) @@ -2026,7 +2036,7 @@ - Ghre_Exam (Dto.InsertInput) + 考试 (Dto.InsertInput) @@ -3045,7 +3055,7 @@ - Ghre_Exam (Model) + 考试 (Model) @@ -3068,11 +3078,21 @@ 试卷ID + + + 封面图片URL + + 考试编号 + + + 考试名称 + + 日期类型 @@ -5048,7 +5068,7 @@ - Ghre_Exam(Dto.View) + 考试(Dto.View) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index 58565c66..a577e587 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -581,7 +581,7 @@ - Ghre_Exam(Controller) + 考试(Controller)