diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_TitleSkill_BoltoneController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_TitleSkill_BoltoneController.cs index 5392a0d0..58848ebe 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_TitleSkill_BoltoneController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_TitleSkill_BoltoneController.cs @@ -1,7 +1,7 @@ namespace Tiobon.Core.Api.Controllers; /// -/// Ghre_TitleSkill_Boltone(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 c482a0b4..a69a4161 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -9782,7 +9782,7 @@ - Ghre_TitleSkill_Boltone (Dto.Base) + 岗位技能_宝连通 (Dto.Base) @@ -16769,7 +16769,7 @@ - Ghre_TitleSkill_Boltone (Dto.EditInput) + 岗位技能_宝连通 (Dto.EditInput) @@ -17370,7 +17370,7 @@ - Ghre_TitleSkill_Boltone (Dto.InsertInput) + 岗位技能_宝连通 (Dto.InsertInput) @@ -27444,7 +27444,7 @@ - Ghre_TitleSkill_Boltone (Model) + 岗位技能_宝连通 (Model) @@ -36405,7 +36405,7 @@ - Ghre_TitleSkill_Boltone(Dto.View1) + 岗位技能_宝连通(Dto.View1) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index b1bd51a8..2616b31c 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -1557,7 +1557,7 @@ - Ghre_TitleSkill_Boltone(Controller) + 岗位技能_宝连通(Controller) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_TitleSkill_BoltoneServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_TitleSkill_BoltoneServices.cs index 05055afe..7983b38a 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_TitleSkill_BoltoneServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_TitleSkill_BoltoneServices.cs @@ -1,7 +1,7 @@ namespace Tiobon.Core.IServices; /// -/// Ghre_TitleSkill_Boltone(自定义服务接口) +/// 岗位技能_宝连通(自定义服务接口) /// public interface IGhre_TitleSkill_BoltoneServices : IBaseServices { diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_TitleSkill_Boltone.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_TitleSkill_Boltone.Dto.Base.cs index 7c9bb779..f69c51f8 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_TitleSkill_Boltone.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_TitleSkill_Boltone.Dto.Base.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/17 15:42:52 SimonHsiao 初版 +*V0.01 2025/4/17 16:24:41 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -18,7 +18,7 @@ namespace Tiobon.Core.Model.Models; /// -/// Ghre_TitleSkill_Boltone (Dto.Base) +/// 岗位技能_宝连通 (Dto.Base) /// public class Ghre_TitleSkill_BoltoneBase { diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_TitleSkill_Boltone.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_TitleSkill_Boltone.Dto.EditInput.cs index 139ff099..dd410242 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_TitleSkill_Boltone.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_TitleSkill_Boltone.Dto.EditInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/17 15:42:52 SimonHsiao 初版 +*V0.01 2025/4/17 16:24:41 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -19,7 +19,7 @@ namespace Tiobon.Core.Model.Models; /// -/// Ghre_TitleSkill_Boltone (Dto.EditInput) +/// 岗位技能_宝连通 (Dto.EditInput) /// public class EditGhre_TitleSkill_BoltoneInput : Ghre_TitleSkill_BoltoneBase { diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_TitleSkill_Boltone.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_TitleSkill_Boltone.Dto.InsertInput.cs index 4212c1f6..e1199947 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_TitleSkill_Boltone.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_TitleSkill_Boltone.Dto.InsertInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/17 15:42:52 SimonHsiao 初版 +*V0.01 2025/4/17 16:24:41 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -19,7 +19,7 @@ namespace Tiobon.Core.Model.Models; /// -/// Ghre_TitleSkill_Boltone (Dto.InsertInput) +/// 岗位技能_宝连通 (Dto.InsertInput) /// public class InsertGhre_TitleSkill_BoltoneInput : Ghre_TitleSkill_BoltoneBase { diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_TitleSkill_Boltone.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_TitleSkill_Boltone.cs index 5179c325..70ed97dd 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_TitleSkill_Boltone.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_TitleSkill_Boltone.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/17 15:42:52 SimonHsiao 初版 +*V0.01 2025/4/17 16:24:41 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -18,9 +18,9 @@ namespace Tiobon.Core.Model.Models; /// -/// Ghre_TitleSkill_Boltone (Model) +/// 岗位技能_宝连通 (Model) /// -[SugarTable("Ghre_TitleSkill_Boltone", "Ghre_TitleSkill_Boltone"), Entity(TableCnName = "Ghre_TitleSkill_Boltone", TableName = "Ghre_TitleSkill_Boltone")] +[SugarTable("Ghre_TitleSkill_Boltone", "Ghre_TitleSkill_Boltone"), Entity(TableCnName = "岗位技能_宝连通", TableName = "Ghre_TitleSkill_Boltone")] public class Ghre_TitleSkill_Boltone : BasePoco { diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_TitleSkill_Boltone.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_TitleSkill_Boltone.Dto.View.cs index ec5dabcf..5711f2bb 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_TitleSkill_Boltone.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_TitleSkill_Boltone.Dto.View.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/17 15:42:52 SimonHsiao 初版 +*V0.01 2025/4/17 16:24:41 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -18,7 +18,7 @@ namespace Tiobon.Core.Model.Models; /// -/// Ghre_TitleSkill_Boltone(Dto.View1) +/// 岗位技能_宝连通(Dto.View1) /// public class Ghre_TitleSkill_BoltoneDto : Ghre_TitleSkill_Boltone { diff --git a/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs index bbb8ce94..9e3e8501 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs @@ -1,7 +1,7 @@ namespace Tiobon.Core.Services; /// -/// Ghre_TitleSkill_Boltone (服务) +/// 岗位技能_宝连通 (服务) /// public class Ghre_TitleSkill_BoltoneServices : BaseServices, IGhre_TitleSkill_BoltoneServices { diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs index fe2140b8..149201af 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs @@ -60,6 +60,21 @@ public class Ghrh_YearHumanSettingsServices : BaseServices Update(long Id, EditGhrh_YearHumanSettingsInput entity) + { + entity.WorkState = 1; + + if (await Db.Queryable() + .WhereIF(entity.GradeId.IsNotEmptyOrNull(), x => x.GradeId == entity.GradeId) + .WhereIF(entity.JobId.IsNotEmptyOrNull(), x => x.JobId == entity.JobId) + .AnyAsync(x => x.Year == entity.Year && x.DeptId == entity.DeptId && x.TitleId == entity.TitleId && x.Id != Id)) + throw new Exception($" {entity.Year}年度,已存在相同数据!"); + + var result = await base.Update(Id, entity); + + return result; + } + public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) { var result = await base.QueryFilterPage(filter, $"WorkState = 1 AND dbo.[FUserDeptPriv] ({App.User.ID}, DeptId, getdate())=1", IsEnable); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 87724ead..a69a4161 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -9780,6 +9780,111 @@ 预留字段12 + + + 岗位技能_宝连通 (Dto.Base) + + + + + 部门ID + + + + + 课程ID + + + + + 岗位ID + + + + + 必/选修 + + + + + 生效日期 + + + + + 失效日期 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + 【牛尾】培训计划 (Dto.Base) @@ -14745,6 +14850,11 @@ 内置 + + + 考核阶段名称 + + Ghrs_Attachment (Dto.Base) @@ -16657,6 +16767,11 @@ 培训讲师异动附件 (Dto.EditInput) + + + 岗位技能_宝连通 (Dto.EditInput) + + 【牛尾】培训计划 (Dto.EditInput) @@ -17253,6 +17368,11 @@ 培训讲师异动附件 (Dto.InsertInput) + + + 岗位技能_宝连通 (Dto.InsertInput) + + 【牛尾】培训计划 (Dto.InsertInput) @@ -27322,6 +27442,111 @@ 预留字段12 + + + 岗位技能_宝连通 (Model) + + + + + 部门ID + + + + + 课程ID + + + + + 岗位ID + + + + + 必/选修 + + + + + 生效日期 + + + + + 失效日期 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + 【牛尾】培训计划 (Model) @@ -36178,6 +36403,21 @@ 修改信息 + + + 岗位技能_宝连通(Dto.View1) + + + + + 创建信息 + + + + + 修改信息 + + 【牛尾】培训计划(Dto.View1) @@ -37243,6 +37483,11 @@ 修改信息 + + + 考核阶段名称 + + Ghrs_Attachment(Dto.View) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index 1e290c27..2616b31c 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -1555,6 +1555,11 @@ status + + + 岗位技能_宝连通(Controller) + + 【牛尾】培训计划(Controller) @@ -2185,6 +2190,13 @@ 考核周期类别(Controller) + + + 根据阶段数 获取对应阶段名称 + + 阶段 + + Ghrs_Attachment(Controller)