diff --git a/Tiobon.Core.Api/Controllers/Ghra/Ghra_TitleController.cs b/Tiobon.Core.Api/Controllers/Ghra/Ghra_TitleController.cs index 2b580ae8..e6a2658b 100644 --- a/Tiobon.Core.Api/Controllers/Ghra/Ghra_TitleController.cs +++ b/Tiobon.Core.Api/Controllers/Ghra/Ghra_TitleController.cs @@ -1,7 +1,7 @@ namespace Tiobon.Core.Api.Controllers; /// -/// Ghra_Title(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 b157ac9d..b90636c6 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -1551,22 +1551,22 @@ - Ghra_Title (Dto.Base) + 岗位 (Dto.Base) - TitleID + 岗位ID - TitleNo + 岗位编号 - TitleName + 岗位名称 @@ -1576,27 +1576,27 @@ - DataBelongID + 集团数据归属 - DeptID + 对应部门 - TitleTypeID + 岗位分类 - TitleLevelID + 岗位层级 - TitleQualifiy + 岗位资格 @@ -1606,17 +1606,17 @@ - RemarkSz + 备注 - SortNo + 序号 - IsDefault + 默认 @@ -12429,7 +12429,7 @@ - Ghra_Title (Dto.EditInput) + 岗位 (Dto.EditInput) @@ -12879,7 +12879,7 @@ - Ghra_Title (Dto.InsertInput) + 岗位 (Dto.InsertInput) @@ -15010,22 +15010,22 @@ - Ghra_Title (Model) + 岗位 (Model) - TitleID + 岗位ID - TitleNo + 岗位编号 - TitleName + 岗位名称 @@ -15035,27 +15035,27 @@ - DataBelongID + 集团数据归属 - DeptID + 对应部门 - TitleTypeID + 岗位分类 - TitleLevelID + 岗位层级 - TitleQualifiy + 岗位资格 @@ -15065,17 +15065,17 @@ - RemarkSz + 备注 - SortNo + 序号 - IsDefault + 默认 @@ -26784,7 +26784,7 @@ - Ghra_Title(Dto.View) + 岗位(Dto.View1) @@ -26797,6 +26797,36 @@ 修改信息 + + + 学历要求 + + + + + 工作年限 + + + + + 语言要求 + + + + + 知识要求 + + + + + 技能要求 + + + + + 工作内容 + + 厂区(Dto.View) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index fa201a2e..8fe21588 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -728,7 +728,7 @@ - Ghra_Title(Controller) + 岗位(Controller) diff --git a/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs b/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs index 1a08b512..e2d5f6ce 100644 --- a/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs +++ b/Tiobon.Core.IServices/Ghra/IGhra_TitleServices.cs @@ -4,7 +4,7 @@ using Tiobon.Core.Model.Models; namespace Tiobon.Core.IServices; /// -/// Ghra_Title(自定义服务接口) +/// 岗位(自定义服务接口) /// public interface IGhra_TitleServices :IBaseServices { diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_Title.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_Title.Dto.Base.cs index 46bfaa02..7567aad5 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_Title.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_Title.Dto.Base.cs @@ -6,169 +6,165 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/8/10 23:34:48 SimonHsiao 初版 +*V0.01 2024/12/19 9:27:28 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +*/ +namespace Tiobon.Core.Model.Models; -namespace Tiobon.Core.Model.Models + +/// +/// 岗位 (Dto.Base) +/// +public class Ghra_TitleBase { /// - /// Ghra_Title (Dto.Base) - /// - public class Ghra_TitleBase - { - - /// - /// TitleID - /// - public int? TitleID { get; set; } - - /// - /// TitleNo - /// - [Display(Name = "TitleNo"), Description("TitleNo"), MaxLength(100, ErrorMessage = "TitleNo 不能超过 100 个字符")] - public string TitleNo { get; set; } - - /// - /// TitleName - /// - [Display(Name = "TitleName"), Description("TitleName"), MaxLength(1000, ErrorMessage = "TitleName 不能超过 1000 个字符")] - public string TitleName { get; set; } - - /// - /// MKey - /// - [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] - public string MKey { get; set; } - - /// - /// DataBelongID - /// - public int? DataBelongID { get; set; } - - /// - /// DeptID - /// - public int? DeptID { get; set; } - - /// - /// TitleTypeID - /// - public int? TitleTypeID { get; set; } - - /// - /// TitleLevelID - /// - public int? TitleLevelID { get; set; } - - /// - /// TitleQualifiy - /// - [Display(Name = "TitleQualifiy"), Description("TitleQualifiy"), MaxLength(2000, ErrorMessage = "TitleQualifiy 不能超过 2000 个字符")] - public string TitleQualifiy { get; set; } - - /// - /// TitleDesc - /// - [Display(Name = "TitleDesc"), Description("TitleDesc"), MaxLength(2000, ErrorMessage = "TitleDesc 不能超过 2000 个字符")] - public string TitleDesc { 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; } - - /// - /// ReverseI1 - /// - public int? ReverseI1 { get; set; } - - /// - /// ReverseI2 - /// - public int? ReverseI2 { get; set; } - - /// - /// ReverseI3 - /// - public int? ReverseI3 { get; set; } - - /// - /// ReverseI4 - /// - public int? ReverseI4 { get; set; } - } + /// 岗位ID + /// + public int? TitleID { get; set; } + + /// + /// 岗位编号 + /// + [Display(Name = "TitleNo"), Description("岗位编号"), MaxLength(100, ErrorMessage = "岗位编号 不能超过 100 个字符")] + public string TitleNo { get; set; } + + /// + /// 岗位名称 + /// + [Display(Name = "TitleName"), Description("岗位名称"), MaxLength(1000, ErrorMessage = "岗位名称 不能超过 1000 个字符")] + public string TitleName { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(200, ErrorMessage = "MKey 不能超过 200 个字符")] + public string MKey { get; set; } + + /// + /// 集团数据归属 + /// + public int? DataBelongID { get; set; } + + /// + /// 对应部门 + /// + public int? DeptID { get; set; } + + /// + /// 岗位分类 + /// + public int? TitleTypeID { get; set; } + + /// + /// 岗位层级 + /// + public int? TitleLevelID { get; set; } + + /// + /// 岗位资格 + /// + [Display(Name = "TitleQualifiy"), Description("岗位资格"), MaxLength(2000, ErrorMessage = "岗位资格 不能超过 2000 个字符")] + public string TitleQualifiy { get; set; } + + /// + /// TitleDesc + /// + [Display(Name = "TitleDesc"), Description("TitleDesc"), MaxLength(2000, ErrorMessage = "TitleDesc 不能超过 2000 个字符")] + public string TitleDesc { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 序号 + /// + public int? SortNo { get; set; } + + /// + /// 默认 + /// + 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; } + + /// + /// ReverseI1 + /// + public int? ReverseI1 { get; set; } + + /// + /// ReverseI2 + /// + public int? ReverseI2 { get; set; } + + /// + /// ReverseI3 + /// + public int? ReverseI3 { get; set; } + + /// + /// ReverseI4 + /// + public int? ReverseI4 { get; set; } } diff --git a/Tiobon.Core.Model/Edit/Ghra/Ghra_Title.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghra/Ghra_Title.Dto.EditInput.cs index bee81ef3..8bd347c0 100644 --- a/Tiobon.Core.Model/Edit/Ghra/Ghra_Title.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_Title.Dto.EditInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/8/10 23:34:48 SimonHsiao 初版 +*V0.01 2024/12/19 9:27:28 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -19,7 +19,7 @@ namespace Tiobon.Core.Model.Models; /// -/// Ghra_Title (Dto.EditInput) +/// 岗位 (Dto.EditInput) /// public class EditGhra_TitleInput : Ghra_TitleBase { diff --git a/Tiobon.Core.Model/Insert/Ghra/Ghra_Title.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghra/Ghra_Title.Dto.InsertInput.cs index 1edbd70d..8bbef9b6 100644 --- a/Tiobon.Core.Model/Insert/Ghra/Ghra_Title.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_Title.Dto.InsertInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/8/10 23:34:48 SimonHsiao 初版 +*V0.01 2024/12/19 9:27:28 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -19,7 +19,7 @@ namespace Tiobon.Core.Model.Models; /// -/// Ghra_Title (Dto.InsertInput) +/// 岗位 (Dto.InsertInput) /// public class InsertGhra_TitleInput : Ghra_TitleBase { diff --git a/Tiobon.Core.Model/Models/Ghra/Ghra_Title.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_Title.cs index 8c6b9e67..8e072925 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_Title.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_Title.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/8/10 23:34:48 SimonHsiao 初版 +*V0.01 2024/12/19 9:27:28 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -18,28 +18,28 @@ namespace Tiobon.Core.Model.Models; /// -/// Ghra_Title (Model) +/// 岗位 (Model) /// -[SugarTable("Ghra_Title", "Ghra_Title"), Entity(TableCnName = "Ghra_Title", TableName = "Ghra_Title")] +[SugarTable("Ghra_Title", "Ghra_Title"), Entity(TableCnName = "岗位", TableName = "Ghra_Title")] public class Ghra_Title : BasePoco1 { /// - /// TitleID + /// 岗位ID /// [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true), Display(Name = "表主键")] public int? TitleID { get; set; } /// - /// TitleNo + /// 岗位编号 /// - [Display(Name = "TitleNo"), Description("TitleNo"), MaxLength(100, ErrorMessage = "TitleNo 不能超过 100 个字符")] + [Display(Name = "TitleNo"), Description("岗位编号"), MaxLength(100, ErrorMessage = "岗位编号 不能超过 100 个字符")] public string TitleNo { get; set; } /// - /// TitleName + /// 岗位名称 /// - [Display(Name = "TitleName"), Description("TitleName"), MaxLength(1000, ErrorMessage = "TitleName 不能超过 1000 个字符")] + [Display(Name = "TitleName"), Description("岗位名称"), MaxLength(1000, ErrorMessage = "岗位名称 不能超过 1000 个字符")] public string TitleName { get; set; } /// @@ -49,29 +49,29 @@ public class Ghra_Title : BasePoco1 public string MKey { get; set; } /// - /// DataBelongID + /// 集团数据归属 /// public int? DataBelongID { get; set; } /// - /// DeptID + /// 对应部门 /// public int? DeptID { get; set; } /// - /// TitleTypeID + /// 岗位分类 /// public int? TitleTypeID { get; set; } /// - /// TitleLevelID + /// 岗位层级 /// public int? TitleLevelID { get; set; } /// - /// TitleQualifiy + /// 岗位资格 /// - [Display(Name = "TitleQualifiy"), Description("TitleQualifiy"), MaxLength(2000, ErrorMessage = "TitleQualifiy 不能超过 2000 个字符")] + [Display(Name = "TitleQualifiy"), Description("岗位资格"), MaxLength(2000, ErrorMessage = "岗位资格 不能超过 2000 个字符")] public string TitleQualifiy { get; set; } /// @@ -81,18 +81,18 @@ public class Ghra_Title : BasePoco1 public string TitleDesc { get; set; } /// - /// RemarkSz + /// 备注 /// - [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] public string RemarkSz { get; set; } /// - /// SortNo + /// 序号 /// public int? SortNo { get; set; } /// - /// IsDefault + /// 默认 /// public int? IsDefault { get; set; } diff --git a/Tiobon.Core.Model/View/Ghra/Ghra_Title.Dto.View.cs b/Tiobon.Core.Model/View/Ghra/Ghra_Title.Dto.View.cs index 04281244..fe434db2 100644 --- a/Tiobon.Core.Model/View/Ghra/Ghra_Title.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghra/Ghra_Title.Dto.View.cs @@ -6,29 +6,61 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/8/10 23:34:48 SimonHsiao 初版 +*V0.01 2024/12/19 9:27:28 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; /// -/// Ghra_Title(Dto.View) +/// 岗位(Dto.View1) /// public class Ghra_TitleDto : Ghra_Title { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } + + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + + /// + /// 学历要求 + /// + public string Degree { get; set; } + + /// + /// 工作年限 + /// + public string WorkExperience { get; set; } + + /// + /// 语言要求 + /// + public string LanguageRequirement { get; set; } + + /// + /// 知识要求 + /// + public string KnowledgeRequirement { get; set; } + + /// + /// 技能要求 + /// + public string SkillRequirement { get; set; } + + /// + /// 工作内容 + /// + public string WorkContent { get; set; } + -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Services/Ghra/Ghra_TitleServices.cs b/Tiobon.Core.Services/Ghra/Ghra_TitleServices.cs index 1de8946b..c05b8594 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_TitleServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_TitleServices.cs @@ -1,7 +1,7 @@ namespace Tiobon.Core.Services; /// -/// Ghra_Title (服务) +/// 岗位 (服务) /// public class Ghra_TitleServices : BaseServices, IGhra_TitleServices { @@ -12,4 +12,11 @@ public class Ghra_TitleServices : BaseServices QueryById(object objId) + { + var entity = await base.QueryById(objId); + + return entity; + } } \ No newline at end of file diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index b157ac9d..415e4e5d 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -1551,22 +1551,22 @@ - Ghra_Title (Dto.Base) + 岗位 (Dto.Base) - TitleID + 岗位ID - TitleNo + 岗位编号 - TitleName + 岗位名称 @@ -1576,27 +1576,27 @@ - DataBelongID + 集团数据归属 - DeptID + 对应部门 - TitleTypeID + 岗位分类 - TitleLevelID + 岗位层级 - TitleQualifiy + 岗位资格 @@ -1606,17 +1606,17 @@ - RemarkSz + 备注 - SortNo + 序号 - IsDefault + 默认 @@ -12429,7 +12429,7 @@ - Ghra_Title (Dto.EditInput) + 岗位 (Dto.EditInput) @@ -12879,7 +12879,7 @@ - Ghra_Title (Dto.InsertInput) + 岗位 (Dto.InsertInput) @@ -15010,22 +15010,22 @@ - Ghra_Title (Model) + 岗位 (Model) - TitleID + 岗位ID - TitleNo + 岗位编号 - TitleName + 岗位名称 @@ -15035,27 +15035,27 @@ - DataBelongID + 集团数据归属 - DeptID + 对应部门 - TitleTypeID + 岗位分类 - TitleLevelID + 岗位层级 - TitleQualifiy + 岗位资格 @@ -15065,17 +15065,17 @@ - RemarkSz + 备注 - SortNo + 序号 - IsDefault + 默认 @@ -26784,7 +26784,7 @@ - Ghra_Title(Dto.View) + 岗位(Dto.View1) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index fa201a2e..8fe21588 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -728,7 +728,7 @@ - Ghra_Title(Controller) + 岗位(Controller)