diff --git a/Tiobon.Core.Api/Controllers/Ghrs/Ghrs_ParaDetailController.cs b/Tiobon.Core.Api/Controllers/Ghrs/Ghrs_ParaDetailController.cs new file mode 100644 index 00000000..c5f76486 --- /dev/null +++ b/Tiobon.Core.Api/Controllers/Ghrs/Ghrs_ParaDetailController.cs @@ -0,0 +1,14 @@ +namespace Tiobon.Core.Api.Controllers; + +/// +/// Ghrs_ParaDetail(Controller) +/// +[Route("api/[controller]")] +[ApiController, GlobalActionFilter] +[Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Ghrs)] +public class Ghrs_ParaDetailController : BaseController +{ + public Ghrs_ParaDetailController(IGhrs_ParaDetailServices service) : base(service) + { + } +} \ No newline at end of file diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 531abb04..fd23003a 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -1148,6 +1148,126 @@ 预留字段12 + + + Ghrs_ParaDetail (Dto.Base) + + + + + ParaDetailId + + + + + ParaTypeId + + + + + ParaMasterId + + + + + ParaTypeNo + + + + + ParaMasterNo + + + + + ParaDetailNo + + + + + ParaDetailName + + + + + ParaDetailEname + + + + + IsBuildIn + + + + + MKey + + + + + SqlFunction + + + + + RemarkSz + + + + + SortNo + + + + + IsDefault + + + + + Reverse1 + + + + + Reverse2 + + + + + Reverse3 + + + + + Reverse4 + + + + + Reverse5 + + + + + Reverse6 + + + + + Reverse7 + + + + + Reverse8 + + + + + Reverse9 + + 系统用户 (Dto.Base) @@ -1377,6 +1497,11 @@ 题目答案 (Dto.EditInput) + + + Ghrs_ParaDetail (Dto.EditInput) + + 系统用户 (Dto.EditInput) @@ -1437,6 +1562,11 @@ 题目答案 (Dto.InsertInput) + + + Ghrs_ParaDetail (Dto.InsertInput) + + 系统用户 (Dto.InsertInput) @@ -2896,6 +3026,126 @@ 任务内存中的状态 + + + Ghrs_ParaDetail (Model) + + + + + ParaDetailId + + + + + ParaTypeId + + + + + ParaMasterId + + + + + ParaTypeNo + + + + + ParaMasterNo + + + + + ParaDetailNo + + + + + ParaDetailName + + + + + ParaDetailEname + + + + + IsBuildIn + + + + + MKey + + + + + SqlFunction + + + + + RemarkSz + + + + + SortNo + + + + + IsDefault + + + + + Reverse1 + + + + + Reverse2 + + + + + Reverse3 + + + + + Reverse4 + + + + + Reverse5 + + + + + Reverse6 + + + + + Reverse7 + + + + + Reverse8 + + + + + Reverse9 + + 系统用户 (Model) @@ -3784,6 +4034,11 @@ 试卷(Dto.View) + + + 评分方式 + + 创建信息 @@ -3839,6 +4094,21 @@ 题目答案(Dto.View) + + + Ghrs_ParaDetail(Dto.View) + + + + + 创建信息 + + + + + 修改信息 + + 系统用户(Dto.View) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index c7a1b9bd..983f17a9 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -714,6 +714,11 @@ + + + Ghrs_ParaDetail(Controller) + + 系统用户(Controller) diff --git a/Tiobon.Core.IServices/Ghrs/IGhrs_ParaDetailServices.cs b/Tiobon.Core.IServices/Ghrs/IGhrs_ParaDetailServices.cs new file mode 100644 index 00000000..f7543a99 --- /dev/null +++ b/Tiobon.Core.IServices/Ghrs/IGhrs_ParaDetailServices.cs @@ -0,0 +1,12 @@ +using Tiobon.Core.IServices.BASE; +using Tiobon.Core.Model.Models; + +namespace Tiobon.Core.IServices +{ + /// + /// Ghrs_ParaDetail(自定义服务接口) + /// + public interface IGhrs_ParaDetailServices :IBaseServices + { + } +} \ No newline at end of file diff --git a/Tiobon.Core.Model/Base/Ghrs/Ghrs_ParaDetail.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrs/Ghrs_ParaDetail.Dto.Base.cs new file mode 100644 index 00000000..3de15ebd --- /dev/null +++ b/Tiobon.Core.Model/Base/Ghrs/Ghrs_ParaDetail.Dto.Base.cs @@ -0,0 +1,161 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrs_ParaDetail.cs +* +*功 能： N / A +* 类 名： Ghrs_ParaDetail +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/5/15 9:27:20 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace Tiobon.Core.Model.Models +{ + + /// + /// Ghrs_ParaDetail (Dto.Base) + /// + public class Ghrs_ParaDetailBase + { + + /// + /// ParaDetailId + /// + public int? ParaDetailId { get; set; } + + /// + /// ParaTypeId + /// + public int? ParaTypeId { get; set; } + + /// + /// ParaMasterId + /// + public int? ParaMasterId { get; set; } + + /// + /// ParaTypeNo + /// + [Display(Name = "ParaTypeNo"), Description("ParaTypeNo"), MaxLength(100, ErrorMessage = "ParaTypeNo 不能超过 100 个字符")] + public string ParaTypeNo { get; set; } + + /// + /// ParaMasterNo + /// + [Display(Name = "ParaMasterNo"), Description("ParaMasterNo"), MaxLength(100, ErrorMessage = "ParaMasterNo 不能超过 100 个字符")] + public string ParaMasterNo { get; set; } + + /// + /// ParaDetailNo + /// + [Display(Name = "ParaDetailNo"), Description("ParaDetailNo"), MaxLength(100, ErrorMessage = "ParaDetailNo 不能超过 100 个字符")] + public string ParaDetailNo { get; set; } + + /// + /// ParaDetailName + /// + [Display(Name = "ParaDetailName"), Description("ParaDetailName"), MaxLength(1000, ErrorMessage = "ParaDetailName 不能超过 1000 个字符")] + public string ParaDetailName { get; set; } + + /// + /// ParaDetailEname + /// + [Display(Name = "ParaDetailEname"), Description("ParaDetailEname"), MaxLength(1000, ErrorMessage = "ParaDetailEname 不能超过 1000 个字符")] + public string ParaDetailEname { get; set; } + + /// + /// IsBuildIn + /// + public int? IsBuildIn { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// SqlFunction + /// + [Display(Name = "SqlFunction"), Description("SqlFunction"), MaxLength(2000, ErrorMessage = "SqlFunction 不能超过 2000 个字符")] + public string SqlFunction { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + } +} diff --git a/Tiobon.Core.Model/Edit/Ghrs/Ghrs_ParaDetail.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_ParaDetail.Dto.EditInput.cs new file mode 100644 index 00000000..b52b08d0 --- /dev/null +++ b/Tiobon.Core.Model/Edit/Ghrs/Ghrs_ParaDetail.Dto.EditInput.cs @@ -0,0 +1,27 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrs_ParaDetail.cs +* +*功 能： N / A +* 类 名： Ghrs_ParaDetail +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/5/15 9:27:20 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models +{ + + /// + /// Ghrs_ParaDetail (Dto.EditInput) + /// + public class EditGhrs_ParaDetailInput : Ghrs_ParaDetailBase + { + } +} diff --git a/Tiobon.Core.Model/Insert/Ghrs/Ghrs_ParaDetail.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_ParaDetail.Dto.InsertInput.cs new file mode 100644 index 00000000..25d766bf --- /dev/null +++ b/Tiobon.Core.Model/Insert/Ghrs/Ghrs_ParaDetail.Dto.InsertInput.cs @@ -0,0 +1,27 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrs_ParaDetail.cs +* +*功 能： N / A +* 类 名： Ghrs_ParaDetail +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/5/15 9:27:20 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models +{ + + /// + /// Ghrs_ParaDetail (Dto.InsertInput) + /// + public class InsertGhrs_ParaDetailInput : Ghrs_ParaDetailBase + { + } +} diff --git a/Tiobon.Core.Model/Models/Ghrs/Ghrs_ParaDetail.cs b/Tiobon.Core.Model/Models/Ghrs/Ghrs_ParaDetail.cs new file mode 100644 index 00000000..2b2287eb --- /dev/null +++ b/Tiobon.Core.Model/Models/Ghrs/Ghrs_ParaDetail.cs @@ -0,0 +1,163 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrs_ParaDetail.cs +* +*功 能： N / A +* 类 名： Ghrs_ParaDetail +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/5/15 9:27:20 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using SqlSugar; + +namespace Tiobon.Core.Model.Models +{ + + /// + /// Ghrs_ParaDetail (Model) + /// + [SugarTable("Ghrs_ParaDetail", "Ghrs_ParaDetail"), Entity(TableCnName = "Ghrs_ParaDetail", TableName = "Ghrs_ParaDetail")] + public class Ghrs_ParaDetail : BasePoco + { + + /// + /// ParaDetailId + /// + public int? ParaDetailId { get; set; } + + /// + /// ParaTypeId + /// + public int? ParaTypeId { get; set; } + + /// + /// ParaMasterId + /// + public int? ParaMasterId { get; set; } + + /// + /// ParaTypeNo + /// + [Display(Name = "ParaTypeNo"), Description("ParaTypeNo"), MaxLength(100, ErrorMessage = "ParaTypeNo 不能超过 100 个字符")] + public string ParaTypeNo { get; set; } + + /// + /// ParaMasterNo + /// + [Display(Name = "ParaMasterNo"), Description("ParaMasterNo"), MaxLength(100, ErrorMessage = "ParaMasterNo 不能超过 100 个字符")] + public string ParaMasterNo { get; set; } + + /// + /// ParaDetailNo + /// + [Display(Name = "ParaDetailNo"), Description("ParaDetailNo"), MaxLength(100, ErrorMessage = "ParaDetailNo 不能超过 100 个字符")] + public string ParaDetailNo { get; set; } + + /// + /// ParaDetailName + /// + [Display(Name = "ParaDetailName"), Description("ParaDetailName"), MaxLength(1000, ErrorMessage = "ParaDetailName 不能超过 1000 个字符")] + public string ParaDetailName { get; set; } + + /// + /// ParaDetailEname + /// + [Display(Name = "ParaDetailEname"), Description("ParaDetailEname"), MaxLength(1000, ErrorMessage = "ParaDetailEname 不能超过 1000 个字符")] + public string ParaDetailEname { get; set; } + + /// + /// IsBuildIn + /// + public int? IsBuildIn { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// SqlFunction + /// + [Display(Name = "SqlFunction"), Description("SqlFunction"), MaxLength(2000, ErrorMessage = "SqlFunction 不能超过 2000 个字符")] + public string SqlFunction { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// Reverse6 + /// + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// Reverse7 + /// + [Display(Name = "Reverse7"), Description("Reverse7"), MaxLength(1000, ErrorMessage = "Reverse7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// Reverse8 + /// + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// Reverse9 + /// + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + } +} diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs index 1f1ad2fe..fba11762 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs @@ -24,6 +24,10 @@ namespace Tiobon.Core.Model.Models public class Ghre_ExamPaperDto : Ghre_ExamPaper { + /// + /// 评分方式 + /// + public string ScoreMethodLabel { get; set; } /// /// 创建信息 diff --git a/Tiobon.Core.Model/View/Ghrs/Ghrs_ParaDetail.Dto.View.cs b/Tiobon.Core.Model/View/Ghrs/Ghrs_ParaDetail.Dto.View.cs new file mode 100644 index 00000000..48a4d171 --- /dev/null +++ b/Tiobon.Core.Model/View/Ghrs/Ghrs_ParaDetail.Dto.View.cs @@ -0,0 +1,34 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrs_ParaDetail.cs +* +*功 能： N / A +* 类 名： Ghrs_ParaDetail +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/5/15 9:27:20 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + +/// +/// Ghrs_ParaDetail(Dto.View) +/// +public class Ghrs_ParaDetailDto : Ghrs_ParaDetail +{ +/// +/// 创建信息 +/// +public string CreateDataInfo { get; set; } + +/// +/// 修改信息 +/// +public string UpdateDataInfo { get; set; } +} diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index c907d4f3..c8ef42e8 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -2,9 +2,9 @@ using System.Linq.Expressions; using AgileObjects.AgileMapper; using Microsoft.AspNetCore.Http; -using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; using SqlSugar; using Tiobon.Core.Common; +using Tiobon.Core.Common.Caches; using Tiobon.Core.Common.DB.Dapper; using Tiobon.Core.Common.DB.Dapper.Extensions; using Tiobon.Core.Common.Enums; @@ -13,10 +13,9 @@ using Tiobon.Core.Common.Helper; using Tiobon.Core.Common.UserManager; using Tiobon.Core.DataAccess; using Tiobon.Core.IRepository.Base; -using Tiobon.Core.IServices; using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; -using Tiobon.Core.Model.Models.RootTkey; +using Tiobon.Core.Model.Models; namespace Tiobon.Core.Services.BASE; @@ -29,9 +28,12 @@ namespace Tiobon.Core.Services.BASE; /// public class BaseServices : IBaseServices where TEntity : class, new() { - public BaseServices(IBaseRepository BaseDal = null) + public ICaching _caching; + + public BaseServices(IBaseRepository BaseDal = null, ICaching caching = null) { this.BaseDal = BaseDal; + _caching = caching; } //public IBaseRepository baseDal = new BaseRepository(); @@ -796,5 +798,24 @@ public class BaseServices : IBaseServ } #endregion + #region 获取通用参数设定 + public async Task GetParaLabel(string key, string value) + { + string label = key; + var list = await _caching.GetAsync>(key); + if (list == null || (list != null && !list.Any())) + { + string sql = $"SELECT * FROM Ghrs_ParaDetail where ParaMasterNo ='{key}' order by SortNo asc"; + list = await Db.Ado.SqlQueryAsync(sql); + if (list.Any()) + await _caching.SetAsync(key, list); + } + + if (list.Any(x => x.ParaDetailNo == value)) + label = list.FirstOrDefault(x => x.ParaDetailNo == value)?.ParaDetailName; + return label; + } + #endregion + #endregion } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrs/Ghrs_ParaDetailServices.cs b/Tiobon.Core.Services/Ghrs/Ghrs_ParaDetailServices.cs new file mode 100644 index 00000000..5c357b0d --- /dev/null +++ b/Tiobon.Core.Services/Ghrs/Ghrs_ParaDetailServices.cs @@ -0,0 +1,21 @@ + +using Tiobon.Core.IServices; +using Tiobon.Core.Model.Models; +using Tiobon.Core.Services.BASE; +using Tiobon.Core.IRepository.Base; + +namespace Tiobon.Core.Services +{ + /// + /// Ghrs_ParaDetail (服务) + /// + public class Ghrs_ParaDetailServices : BaseServices, IGhrs_ParaDetailServices + { + private readonly IBaseRepository _dal; + public Ghrs_ParaDetailServices(IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + } + } +} \ No newline at end of file