From 715f20a58f128d4c7d66ac5f5aa09972438ce2f3 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Fri, 11 Apr 2025 13:24:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E8=AE=AD=E7=94=B3=E8=AF=B7=5F?= =?UTF-8?q?=E5=AE=9D=E8=BF=9E=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 6 +- ...ternalTrainApplyOrder_BoltoneController.cs | 14 + ...ternalTrainApplyOrder_BoltoneController.cs | 14 - Tiobon.Core.Api/Tiobon.Core.Model.xml | 1180 ++++++++--------- Tiobon.Core.Api/Tiobon.Core.xml | 10 +- ...ExternalTrainApplyOrder_BoltoneServices.cs | 8 + ...ExternalTrainApplyOrder_BoltoneServices.cs | 8 - ...ternalTrainApplyOrder_Boltone.Dto.Base.cs} | 14 +- ...lTrainApplyOrder_Boltone.Dto.EditInput.cs} | 8 +- ...rainApplyOrder_Boltone.Dto.InsertInput.cs} | 10 +- .../Ghre_ExternalTrainApplyOrder_Boltone.cs | 325 +++++ .../Ghrh_ExternalTrainApplyOrder_Boltone.cs | 320 ----- ...ternalTrainApplyOrder_Boltone.Dto.View.cs} | 8 +- Tiobon.Core.Services/CommonServices.cs | 38 + ...ExternalTrainApplyOrder_BoltoneServices.cs | 15 + ...ExternalTrainApplyOrder_BoltoneServices.cs | 15 - Tiobon.Core/Tiobon.Core.Model.xml | 565 ++++++++ Tiobon.Core/Tiobon.Core.xml | 5 + 18 files changed, 1591 insertions(+), 972 deletions(-) create mode 100644 Tiobon.Core.Api/Controllers/Ghre/Ghre_ExternalTrainApplyOrder_BoltoneController.cs delete mode 100644 Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ExternalTrainApplyOrder_BoltoneController.cs create mode 100644 Tiobon.Core.IServices/Ghre/IGhre_ExternalTrainApplyOrder_BoltoneServices.cs delete mode 100644 Tiobon.Core.IServices/Ghrh/IGhrh_ExternalTrainApplyOrder_BoltoneServices.cs rename Tiobon.Core.Model/Base/{Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.Base.cs => Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.Base.cs} (95%) rename Tiobon.Core.Model/Edit/{Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.EditInput.cs => Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.EditInput.cs} (78%) rename Tiobon.Core.Model/Insert/{Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.InsertInput.cs => Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.InsertInput.cs} (77%) create mode 100644 Tiobon.Core.Model/Models/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.cs delete mode 100644 Tiobon.Core.Model/Models/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.cs rename Tiobon.Core.Model/View/{Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.View.cs => Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.View.cs} (84%) create mode 100644 Tiobon.Core.Services/Ghre/Ghre_ExternalTrainApplyOrder_BoltoneServices.cs delete mode 100644 Tiobon.Core.Services/Ghrh/Ghrh_ExternalTrainApplyOrder_BoltoneServices.cs diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index bac06c6c..42e0c05f 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -58354,10 +58354,10 @@ Ghra_staff_InsureBase 29CAE799-AAE5-451C-8261-B7E59EA6FAEF 外训申请_宝连通 -Ghrh_ExternalTrainApplyOrder_Boltone +Ghre_ExternalTrainApplyOrder_Boltone 1744334252 Administrator -1744337125 +1744342473 Administrator 外训申请_宝连通 diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExternalTrainApplyOrder_BoltoneController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExternalTrainApplyOrder_BoltoneController.cs new file mode 100644 index 00000000..1687b01b --- /dev/null +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExternalTrainApplyOrder_BoltoneController.cs @@ -0,0 +1,14 @@ +namespace Tiobon.Core.Api.Controllers; + +/// +/// 外训申请_宝连通(Controller) +/// +[Route("api/[controller]")] +[ApiController, GlobalActionFilter] +[Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Ghre)] +public class Ghre_ExternalTrainApplyOrder_BoltoneController : BaseController +{ + public Ghre_ExternalTrainApplyOrder_BoltoneController(IGhre_ExternalTrainApplyOrder_BoltoneServices service) : base(service) + { + } +} \ No newline at end of file diff --git a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ExternalTrainApplyOrder_BoltoneController.cs b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ExternalTrainApplyOrder_BoltoneController.cs deleted file mode 100644 index 100427a8..00000000 --- a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ExternalTrainApplyOrder_BoltoneController.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Tiobon.Core.Api.Controllers; - -/// -/// 外训申请_宝连通(Controller) -/// -[Route("api/[controller]")] -[ApiController, GlobalActionFilter] -[Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Ghrh)] -public class Ghrh_ExternalTrainApplyOrder_BoltoneController : BaseController -{ - public Ghrh_ExternalTrainApplyOrder_BoltoneController(IGhrh_ExternalTrainApplyOrder_BoltoneServices 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 e3f7fc58..0a3a0550 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -5055,6 +5055,276 @@ 预留字段12 + + + 外训申请_宝连通 (Dto.Base) + + + + + 发起时间 + + + + + 发起人ID + + + + + 发起人部门ID + + + + + 培训类型 + + + + + 受训人员 + + + + + 培训开始时间 + + + + + 培训结束时间 + + + + + 培训地点 + + + + + 培训机构 + + + + + 课程ID + + + + + 课程大纲 + + + + + 受训目的 + + + + + 费用 + + + + + 是否签订服务协议 + + + + + 服务协议 + + + + + 服务协议开始日期 + + + + + 服务协议结束日期 + + + + + 培训结果 + + + + + 证件类型 + + + + + 证件编号 + + + + + 证件有效开始日期 + + + + + 证件有效结束日期 + + + + + 培训机构评价 + + + + + 培训成果确认 + + + + + WorkID + + + + + WorkNo + + + + + ToDoType + + + + + BatchSID + + + + + WorkState + + + + + ShiftID + + + + + ConfirmUserID + + + + + ConfirmTime + + + + + ConfirmComment + + + + + 同意人 + + + + + 同意时间 + + + + + 同意理由 + + + + + 拒绝人 + + + + + 拒绝时间 + + + + + 拒绝理由 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + 多岗维护 (Dto.Base) @@ -9775,322 +10045,52 @@ 预留字段2 - - - 预留字段3 - - - - - 预留字段4 - - - - - 预留字段5 - - - - - 预留字段6 - - - - - 预留字段7 - - - - - 预留字段8 - - - - - 预留字段9 - - - - - 预留字段10 - - - - - 预留字段11 - - - - - 预留字段12 - - - - - 外训申请_宝连通 (Dto.Base) - - - - - 发起时间 - - - - - 发起人ID - - - - - 发起人部门ID - - - - - 培训类型 - - - - - 受训人员 - - - - - 培训开始时间 - - - - - 培训结束时间 - - - - - 培训地点 - - - - - 培训机构 - - - - - 课程ID - - - - - 课程大纲 - - - - - 受训目的 - - - - - 费用 - - - - - 是否签订服务协议 - - - - - 服务协议 - - - - - 服务协议开始日期 - - - - - 服务协议结束日期 - - - - - 培训结果 - - - - - 证件类型 - - - - - 证件编号 - - - - - 证件有效开始日期 - - - - - 证件有效结束日期 - - - - - 培训机构评价 - - - - - 培训成果确认 - - - - - WorkID - - - - - WorkNo - - - - - ToDoType - - - - - BatchSID - - - - - WorkState - - - - - ShiftID - - - - - ConfirmUserID - - - - - ConfirmTime - - - - - ConfirmComment - - - - - 同意人 - - - - - 同意时间 - - - - - 同意理由 - - - - - 拒绝人 - - - - - 拒绝时间 - - - - - 拒绝理由 - - - - - 备注 - - - - - 默认标志 - - - - - 预留字段1 - - - - - 预留字段2 - - - + 预留字段3 - + 预留字段4 - + 预留字段5 - + 预留字段6 - + 预留字段7 - + 预留字段8 - + 预留字段9 - + 预留字段10 - + 预留字段11 - + 预留字段12 @@ -16067,6 +16067,11 @@ Ghre_ExamStaff (Dto.EditInput) + + + 外训申请_宝连通 (Dto.EditInput) + + 多岗维护 (Dto.EditInput) @@ -16262,11 +16267,6 @@ 招聘参数配置组 (Dto.EditInput) - - - 外训申请_宝连通 (Dto.EditInput) - - 人力需求维护 (Dto.EditInput) @@ -16648,6 +16648,11 @@ Ghre_ExamStaff (Dto.InsertInput) + + + 外训申请_宝连通 (Dto.InsertInput) + + 多岗维护 (Dto.InsertInput) @@ -16843,11 +16848,6 @@ 招聘参数配置组 (Dto.InsertInput) - - - 外训申请_宝连通 (Dto.InsertInput) - - 人力需求维护 (Dto.InsertInput) @@ -22179,75 +22179,345 @@ - 来源 + 来源 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + + + + 外训申请_宝连通 (Model) + + + + + 发起时间 + + + + + 发起人ID + + + + + 发起人部门ID + + + + + 培训类型 + + + + + 受训人员 + + + + + 培训开始时间 + + + + + 培训结束时间 + + + + + 培训地点 + + + + + 培训机构 + + + + + 课程ID + + + + + 课程大纲 + + + + + 受训目的 + + + + + 费用 + + + + + 是否签订服务协议 + + + + + 服务协议 + + + + + 服务协议开始日期 + + + + + 服务协议结束日期 + + + + + 培训结果 + + + + + 证件类型 + + + + + 证件编号 + + + + + 证件有效开始日期 + + + + + 证件有效结束日期 + + + + + 培训机构评价 + + + + + 培训成果确认 + + + + + WorkID + + + + + WorkNo + + + + + ToDoType + + + + + BatchSID + + + + + WorkState + + + + + ShiftID + + + + + ConfirmUserID + + + + + ConfirmTime + + + + + ConfirmComment + + + + + 同意人 + + + + + 同意时间 + + + + + 同意理由 + + + + + 拒绝人 + + + + + 拒绝时间 + + + + + 拒绝理由 - + 备注 - + 默认标志 - + 预留字段1 - + 预留字段2 - + 预留字段3 - + 预留字段4 - + 预留字段5 - + 预留字段6 - + 预留字段7 - + 预留字段8 - + 预留字段9 - + 预留字段10 - + 预留字段11 - + 预留字段12 @@ -27072,276 +27342,6 @@ 预留字段12 - - - 外训申请_宝连通 (Model) - - - - - 发起时间 - - - - - 发起人ID - - - - - 发起人部门ID - - - - - 培训类型 - - - - - 受训人员 - - - - - 培训开始时间 - - - - - 培训结束时间 - - - - - 培训地点 - - - - - 培训机构 - - - - - 课程ID - - - - - 课程大纲 - - - - - 受训目的 - - - - - 费用 - - - - - 是否签订服务协议 - - - - - 服务协议 - - - - - 服务协议开始日期 - - - - - 服务协议结束日期 - - - - - 培训结果 - - - - - 证件类型 - - - - - 证件编号 - - - - - 证件有效开始日期 - - - - - 证件有效结束日期 - - - - - 培训机构评价 - - - - - 培训成果确认 - - - - - WorkID - - - - - WorkNo - - - - - ToDoType - - - - - BatchSID - - - - - WorkState - - - - - ShiftID - - - - - ConfirmUserID - - - - - ConfirmTime - - - - - ConfirmComment - - - - - 同意人 - - - - - 同意时间 - - - - - 同意理由 - - - - - 拒绝人 - - - - - 拒绝时间 - - - - - 拒绝理由 - - - - - 备注 - - - - - 默认标志 - - - - - 预留字段1 - - - - - 预留字段2 - - - - - 预留字段3 - - - - - 预留字段4 - - - - - 预留字段5 - - - - - 预留字段6 - - - - - 预留字段7 - - - - - 预留字段8 - - - - - 预留字段9 - - - - - 预留字段10 - - - - - 预留字段11 - - - - - 预留字段12 - - 人力需求维护 (Model) @@ -34578,6 +34578,21 @@ 修改信息 + + + 外训申请_宝连通(Dto.View1) + + + + + 创建信息 + + + + + 修改信息 + + 多岗维护(Dto.View1) @@ -35373,21 +35388,6 @@ 修改信息 - - - 外训申请_宝连通(Dto.View1) - - - - - 创建信息 - - - - - 修改信息 - - 人力需求维护(Dto.View1) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index 180e250e..ccc09d81 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -1068,6 +1068,11 @@ Ghre_ExamStaff(Controller) + + + 外训申请_宝连通(Controller) + + 多岗维护(Controller) @@ -1549,11 +1554,6 @@ - - - 外训申请_宝连通(Controller) - - 人力需求维护(Controller) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExternalTrainApplyOrder_BoltoneServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExternalTrainApplyOrder_BoltoneServices.cs new file mode 100644 index 00000000..8d945589 --- /dev/null +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExternalTrainApplyOrder_BoltoneServices.cs @@ -0,0 +1,8 @@ +namespace Tiobon.Core.IServices; + +/// +/// 外训申请_宝连通(自定义服务接口) +/// +public interface IGhre_ExternalTrainApplyOrder_BoltoneServices : IBaseServices +{ +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ExternalTrainApplyOrder_BoltoneServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ExternalTrainApplyOrder_BoltoneServices.cs deleted file mode 100644 index ef21af4c..00000000 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ExternalTrainApplyOrder_BoltoneServices.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Tiobon.Core.IServices; - -/// -/// 外训申请_宝连通(自定义服务接口) -/// -public interface IGhrh_ExternalTrainApplyOrder_BoltoneServices : IBaseServices -{ -} \ No newline at end of file diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.Base.cs similarity index 95% rename from Tiobon.Core.Model/Base/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.Base.cs rename to Tiobon.Core.Model/Base/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.Base.cs index 366f8831..ecf2c5cb 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.Base.cs @@ -1,12 +1,12 @@ /* 代码由框架生成,任何更改都可能导致被代码生成器覆盖,可自行修改。 -* Ghrh_ExternalTrainApplyOrder_Boltone.cs +* Ghre_ExternalTrainApplyOrder_Boltone.cs * *功 能: N / A -* 类 名: Ghrh_ExternalTrainApplyOrder_Boltone +* 类 名: Ghre_ExternalTrainApplyOrder_Boltone * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/11 10:13:01 SimonHsiao 初版 +*V0.01 2025/4/11 11:35:25 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -20,7 +20,7 @@ namespace Tiobon.Core.Model.Models; /// /// 外训申请_宝连通 (Dto.Base) /// -public class Ghrh_ExternalTrainApplyOrder_BoltoneBase +public class Ghre_ExternalTrainApplyOrder_BoltoneBase { /// @@ -316,4 +316,10 @@ public class Ghrh_ExternalTrainApplyOrder_BoltoneBase /// 预留字段12 /// public int? ReverseI2 { get; set; } + + public List ExternalAttachments { get; set; } = new List(); + + public List ContractAttachments { get; set; } = new List(); + + public List Attachments { get; set; } = new List(); } diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.EditInput.cs similarity index 78% rename from Tiobon.Core.Model/Edit/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.EditInput.cs rename to Tiobon.Core.Model/Edit/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.EditInput.cs index 257388ca..ee2ef40d 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.EditInput.cs @@ -1,12 +1,12 @@ /* 代码由框架生成,任何更改都可能导致被代码生成器覆盖,可自行修改。 -* Ghrh_ExternalTrainApplyOrder_Boltone.cs +* Ghre_ExternalTrainApplyOrder_Boltone.cs * *功 能: N / A -* 类 名: Ghrh_ExternalTrainApplyOrder_Boltone +* 类 名: Ghre_ExternalTrainApplyOrder_Boltone * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/11 10:13:01 SimonHsiao 初版 +*V0.01 2025/4/11 11:35:25 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -21,6 +21,6 @@ namespace Tiobon.Core.Model.Models; /// /// 外训申请_宝连通 (Dto.EditInput) /// -public class EditGhrh_ExternalTrainApplyOrder_BoltoneInput : Ghrh_ExternalTrainApplyOrder_BoltoneBase +public class EditGhre_ExternalTrainApplyOrder_BoltoneInput : Ghre_ExternalTrainApplyOrder_BoltoneBase { } diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.InsertInput.cs similarity index 77% rename from Tiobon.Core.Model/Insert/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.InsertInput.cs rename to Tiobon.Core.Model/Insert/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.InsertInput.cs index 159d8aca..3ed49936 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.InsertInput.cs @@ -1,19 +1,19 @@ /* 代码由框架生成,任何更改都可能导致被代码生成器覆盖,可自行修改。 -* Ghrh_ExternalTrainApplyOrder_Boltone.cs +* Ghre_ExternalTrainApplyOrder_Boltone.cs * *功 能: N / A -* 类 名: Ghrh_ExternalTrainApplyOrder_Boltone +* 类 名: Ghre_ExternalTrainApplyOrder_Boltone * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/11 10:13:01 SimonHsiao 初版 +*V0.01 2025/4/11 11:35:25 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ *│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ *│ 作者:SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -21,6 +21,6 @@ namespace Tiobon.Core.Model.Models; /// /// 外训申请_宝连通 (Dto.InsertInput) /// -public class InsertGhrh_ExternalTrainApplyOrder_BoltoneInput : Ghrh_ExternalTrainApplyOrder_BoltoneBase +public class InsertGhre_ExternalTrainApplyOrder_BoltoneInput : Ghre_ExternalTrainApplyOrder_BoltoneBase { } diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.cs new file mode 100644 index 00000000..68963eeb --- /dev/null +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.cs @@ -0,0 +1,325 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖,可自行修改。 +* Ghre_ExternalTrainApplyOrder_Boltone.cs +* +*功 能: N / A +* 类 名: Ghre_ExternalTrainApplyOrder_Boltone +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/4/11 11:35:25 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ +*│ 作者:SimonHsiao │ +*└──────────────────────────────────┘ +*/ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using SqlSugar; + +namespace Tiobon.Core.Model.Models +{ + + /// + /// 外训申请_宝连通 (Model) + /// + [SugarTable("Ghre_ExternalTrainApplyOrder_Boltone", "Ghre_ExternalTrainApplyOrder_Boltone"), Entity(TableCnName = "外训申请_宝连通", TableName = "Ghre_ExternalTrainApplyOrder_Boltone")] + public class Ghre_ExternalTrainApplyOrder_Boltone : BasePoco + { + + /// + /// 发起时间 + /// + public DateTime? ApplicantTime { get; set; } + + /// + /// 发起人ID + /// + public int? ApplicantId { get; set; } + + /// + /// 发起人部门ID + /// + public int? ApplicantDeptId { get; set; } + + /// + /// 培训类型 + /// + [Display(Name = "TrainType"), Description("培训类型"), MaxLength(32, ErrorMessage = "培训类型 不能超过 32 个字符")] + public string TrainType { get; set; } + + /// + /// 受训人员 + /// + public int? StaffId { get; set; } + + /// + /// 培训开始时间 + /// + public DateTime? BeginTime { get; set; } + + /// + /// 培训结束时间 + /// + public DateTime? EndTime { get; set; } + + /// + /// 培训地点 + /// + [Display(Name = "Address"), Description("培训地点"), MaxLength(256, ErrorMessage = "培训地点 不能超过 256 个字符")] + public string Address { get; set; } + + /// + /// 培训机构 + /// + public long? SchoolId { get; set; } + + /// + /// 课程ID + /// + public long? CourseId { get; set; } + + /// + /// 课程大纲 + /// + [Display(Name = "CourseOutline"), Description("课程大纲"), MaxLength(2000, ErrorMessage = "课程大纲 不能超过 2000 个字符")] + public string CourseOutline { get; set; } + + /// + /// 受训目的 + /// + [Display(Name = "TrainGoal"), Description("受训目的"), MaxLength(2000, ErrorMessage = "受训目的 不能超过 2000 个字符")] + public string TrainGoal { get; set; } + + /// + /// 费用 + /// + [Display(Name = "Cost"), Description("费用"), Column(TypeName = "decimal(20,2)")] + public decimal? Cost { get; set; } + + /// + /// 是否签订服务协议 + /// + [Display(Name = "IsSignContract"), Description("是否签订服务协议"), MaxLength(32, ErrorMessage = "是否签订服务协议 不能超过 32 个字符")] + public string IsSignContract { get; set; } + + /// + /// 服务协议 + /// + [Display(Name = "ContractContent"), Description("服务协议"), MaxLength(2000, ErrorMessage = "服务协议 不能超过 2000 个字符")] + public string ContractContent { get; set; } + + /// + /// 服务协议开始日期 + /// + public DateTime? ContractBeginTime { get; set; } + + /// + /// 服务协议结束日期 + /// + public DateTime? ContractEndTime { get; set; } + + /// + /// 培训结果 + /// + [Display(Name = "TrainResult"), Description("培训结果"), MaxLength(2000, ErrorMessage = "培训结果 不能超过 2000 个字符")] + public string TrainResult { get; set; } + + /// + /// 证件类型 + /// + [Display(Name = "CertificateType"), Description("证件类型"), MaxLength(32, ErrorMessage = "证件类型 不能超过 32 个字符")] + public string CertificateType { get; set; } + + /// + /// 证件编号 + /// + [Display(Name = "CertificateNo"), Description("证件编号"), MaxLength(256, ErrorMessage = "证件编号 不能超过 256 个字符")] + public string CertificateNo { get; set; } + + /// + /// 证件有效开始日期 + /// + public DateTime? CertificateBeginTime { get; set; } + + /// + /// 证件有效结束日期 + /// + public DateTime? CertificateEndTime { get; set; } + + /// + /// 培训机构评价 + /// + [Display(Name = "SchoolEval"), Description("培训机构评价"), MaxLength(100, ErrorMessage = "培训机构评价 不能超过 100 个字符")] + public string SchoolEval { get; set; } + + /// + /// 培训成果确认 + /// + [Display(Name = "SchoolOutcomeConfirm"), Description("培训成果确认"), MaxLength(32, ErrorMessage = "培训成果确认 不能超过 32 个字符")] + public string SchoolOutcomeConfirm { get; set; } + + /// + /// WorkID + /// + public int? WorkID { get; set; } + + /// + /// WorkNo + /// + [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")] + public string WorkNo { get; set; } + + /// + /// ToDoType + /// + [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] + public string ToDoType { get; set; } + + /// + /// BatchSID + /// + [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")] + public string BatchSID { get; set; } + + /// + /// WorkState + /// + public int? WorkState { get; set; } + + /// + /// ShiftID + /// + public int? ShiftID { get; set; } + + /// + /// ConfirmUserID + /// + public int? ConfirmUserID { get; set; } + + /// + /// ConfirmTime + /// + public DateTime? ConfirmTime { get; set; } + + /// + /// ConfirmComment + /// + [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] + public string ConfirmComment { get; set; } + + /// + /// 同意人 + /// + public long? AgreeUserId { get; set; } + + /// + /// 同意时间 + /// + public DateTime? AgreeTime { get; set; } + + /// + /// 同意理由 + /// + [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")] + public string AgreeReason { get; set; } + + /// + /// 拒绝人 + /// + public long? RefuseUserId { get; set; } + + /// + /// 拒绝时间 + /// + public DateTime? RefuseTime { get; set; } + + /// + /// 拒绝理由 + /// + [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")] + public string RefuseReason { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// 预留字段1 + /// + [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// 预留字段2 + /// + [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// 预留字段3 + /// + [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// 预留字段4 + /// + [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// 预留字段5 + /// + [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// 预留字段6 + /// + [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// 预留字段7 + /// + [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// 预留字段8 + /// + [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// 预留字段9 + /// + [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// 预留字段10 + /// + [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] + public string Reverse10 { get; set; } + + /// + /// 预留字段11 + /// + public int? ReverseI1 { get; set; } + + /// + /// 预留字段12 + /// + public int? ReverseI2 { get; set; } + } +} diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.cs deleted file mode 100644 index 5902bcbb..00000000 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.cs +++ /dev/null @@ -1,320 +0,0 @@ -/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖,可自行修改。 -* Ghrh_ExternalTrainApplyOrder_Boltone.cs -* -*功 能: N / A -* 类 名: Ghrh_ExternalTrainApplyOrder_Boltone -* -* Ver 变更日期 负责人 变更内容 -* ─────────────────────────────────── -*V0.01 2025/4/11 10:13:01 SimonHsiao 初版 -* -* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. -*┌──────────────────────────────────┐ -*│ 此技术信息为本公司机密信息,未经本公司书面同意禁止向第三方披露. │ -*│ 作者:SimonHsiao │ -*└──────────────────────────────────┘ -*/ -namespace Tiobon.Core.Model.Models; - - -/// -/// 外训申请_宝连通 (Model) -/// -[SugarTable("Ghrh_ExternalTrainApplyOrder_Boltone", "Ghrh_ExternalTrainApplyOrder_Boltone"), Entity(TableCnName = "外训申请_宝连通", TableName = "Ghrh_ExternalTrainApplyOrder_Boltone")] -public class Ghrh_ExternalTrainApplyOrder_Boltone : BasePoco -{ - - /// - /// 发起时间 - /// - public DateTime? ApplicantTime { get; set; } - - /// - /// 发起人ID - /// - public int? ApplicantId { get; set; } - - /// - /// 发起人部门ID - /// - public int? ApplicantDeptId { get; set; } - - /// - /// 培训类型 - /// - [Display(Name = "TrainType"), Description("培训类型"), MaxLength(32, ErrorMessage = "培训类型 不能超过 32 个字符")] - public string TrainType { get; set; } - - /// - /// 受训人员 - /// - public int? StaffId { get; set; } - - /// - /// 培训开始时间 - /// - public DateTime? BeginTime { get; set; } - - /// - /// 培训结束时间 - /// - public DateTime? EndTime { get; set; } - - /// - /// 培训地点 - /// - [Display(Name = "Address"), Description("培训地点"), MaxLength(256, ErrorMessage = "培训地点 不能超过 256 个字符")] - public string Address { get; set; } - - /// - /// 培训机构 - /// - public long? SchoolId { get; set; } - - /// - /// 课程ID - /// - public long? CourseId { get; set; } - - /// - /// 课程大纲 - /// - [Display(Name = "CourseOutline"), Description("课程大纲"), MaxLength(2000, ErrorMessage = "课程大纲 不能超过 2000 个字符")] - public string CourseOutline { get; set; } - - /// - /// 受训目的 - /// - [Display(Name = "TrainGoal"), Description("受训目的"), MaxLength(2000, ErrorMessage = "受训目的 不能超过 2000 个字符")] - public string TrainGoal { get; set; } - - /// - /// 费用 - /// - [Display(Name = "Cost"), Description("费用"), Column(TypeName = "decimal(20,2)")] - public decimal? Cost { get; set; } - - /// - /// 是否签订服务协议 - /// - [Display(Name = "IsSignContract"), Description("是否签订服务协议"), MaxLength(32, ErrorMessage = "是否签订服务协议 不能超过 32 个字符")] - public string IsSignContract { get; set; } - - /// - /// 服务协议 - /// - [Display(Name = "ContractContent"), Description("服务协议"), MaxLength(2000, ErrorMessage = "服务协议 不能超过 2000 个字符")] - public string ContractContent { get; set; } - - /// - /// 服务协议开始日期 - /// - public DateTime? ContractBeginTime { get; set; } - - /// - /// 服务协议结束日期 - /// - public DateTime? ContractEndTime { get; set; } - - /// - /// 培训结果 - /// - [Display(Name = "TrainResult"), Description("培训结果"), MaxLength(2000, ErrorMessage = "培训结果 不能超过 2000 个字符")] - public string TrainResult { get; set; } - - /// - /// 证件类型 - /// - [Display(Name = "CertificateType"), Description("证件类型"), MaxLength(32, ErrorMessage = "证件类型 不能超过 32 个字符")] - public string CertificateType { get; set; } - - /// - /// 证件编号 - /// - [Display(Name = "CertificateNo"), Description("证件编号"), MaxLength(256, ErrorMessage = "证件编号 不能超过 256 个字符")] - public string CertificateNo { get; set; } - - /// - /// 证件有效开始日期 - /// - public DateTime? CertificateBeginTime { get; set; } - - /// - /// 证件有效结束日期 - /// - public DateTime? CertificateEndTime { get; set; } - - /// - /// 培训机构评价 - /// - [Display(Name = "SchoolEval"), Description("培训机构评价"), MaxLength(100, ErrorMessage = "培训机构评价 不能超过 100 个字符")] - public string SchoolEval { get; set; } - - /// - /// 培训成果确认 - /// - [Display(Name = "SchoolOutcomeConfirm"), Description("培训成果确认"), MaxLength(32, ErrorMessage = "培训成果确认 不能超过 32 个字符")] - public string SchoolOutcomeConfirm { get; set; } - - /// - /// WorkID - /// - public int? WorkID { get; set; } - - /// - /// WorkNo - /// - [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")] - public string WorkNo { get; set; } - - /// - /// ToDoType - /// - [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")] - public string ToDoType { get; set; } - - /// - /// BatchSID - /// - [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")] - public string BatchSID { get; set; } - - /// - /// WorkState - /// - public int? WorkState { get; set; } - - /// - /// ShiftID - /// - public int? ShiftID { get; set; } - - /// - /// ConfirmUserID - /// - public int? ConfirmUserID { get; set; } - - /// - /// ConfirmTime - /// - public DateTime? ConfirmTime { get; set; } - - /// - /// ConfirmComment - /// - [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")] - public string ConfirmComment { get; set; } - - /// - /// 同意人 - /// - public long? AgreeUserId { get; set; } - - /// - /// 同意时间 - /// - public DateTime? AgreeTime { get; set; } - - /// - /// 同意理由 - /// - [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")] - public string AgreeReason { get; set; } - - /// - /// 拒绝人 - /// - public long? RefuseUserId { get; set; } - - /// - /// 拒绝时间 - /// - public DateTime? RefuseTime { get; set; } - - /// - /// 拒绝理由 - /// - [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")] - public string RefuseReason { get; set; } - - /// - /// 备注 - /// - [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] - public string RemarkSz { get; set; } - - /// - /// 默认标志 - /// - public int? IsDefault { get; set; } - - /// - /// 预留字段1 - /// - [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// 预留字段2 - /// - [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// 预留字段3 - /// - [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] - public string Reverse3 { get; set; } - - /// - /// 预留字段4 - /// - [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] - public string Reverse4 { get; set; } - - /// - /// 预留字段5 - /// - [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } - - /// - /// 预留字段6 - /// - [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } - - /// - /// 预留字段7 - /// - [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] - public string Reverse7 { get; set; } - - /// - /// 预留字段8 - /// - [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } - - /// - /// 预留字段9 - /// - [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } - - /// - /// 预留字段10 - /// - [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] - public string Reverse10 { get; set; } - - /// - /// 预留字段11 - /// - public int? ReverseI1 { get; set; } - - /// - /// 预留字段12 - /// - public int? ReverseI2 { get; set; } -} diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.View.cs similarity index 84% rename from Tiobon.Core.Model/View/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.View.cs rename to Tiobon.Core.Model/View/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.View.cs index f3d66f85..1e498181 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_ExternalTrainApplyOrder_Boltone.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExternalTrainApplyOrder_Boltone.Dto.View.cs @@ -1,12 +1,12 @@ /* 代码由框架生成,任何更改都可能导致被代码生成器覆盖,可自行修改。 -* Ghrh_ExternalTrainApplyOrder_Boltone.cs +* Ghre_ExternalTrainApplyOrder_Boltone.cs * *功 能: N / A -* 类 名: Ghrh_ExternalTrainApplyOrder_Boltone +* 类 名: Ghre_ExternalTrainApplyOrder_Boltone * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/4/11 10:13:01 SimonHsiao 初版 +*V0.01 2025/4/11 11:35:25 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -20,7 +20,7 @@ namespace Tiobon.Core.Model.Models; /// /// 外训申请_宝连通(Dto.View1) /// -public class Ghrh_ExternalTrainApplyOrder_BoltoneDto : Ghrh_ExternalTrainApplyOrder_Boltone +public class Ghre_ExternalTrainApplyOrder_BoltoneDto : Ghre_ExternalTrainApplyOrder_Boltone { /// /// 创建信息 diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index aa0b3aad..bd4c9a1a 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -3892,6 +3892,16 @@ public partial class CommonServices : BaseServices>, ICommon }; } break; + + case "F_ESS_ExternalTrainApply_Boltone": + if (param.doType == "Insert") + { + flowReturn.DT_TableDataT1 = new List() + { + + }; + } + break; } #endregion @@ -4214,6 +4224,34 @@ public partial class CommonServices : BaseServices>, ICommon } #endregion + break; + + case "F_ESS_ExternalTrainApply_Boltone": //外训申请_宝连通 + + #region 写入数据,并判断是否有错误 + switch (param.doType) + { + case "Apply": + case "BatchApply": + + #region 写入数据,并判断是否有错误 + string json = param.jsonParam.ToString(); + var dict = JsonHelper.JsonToObj(json); + //dict.RequestNo = await GenerateContinuousSequence("Ghrh_HumanRequest", "RequestNo", "R"); + id = await Db.Insertable(dict).ExecuteReturnSnowflakeIdAsync(); + + sql = $"SELECT ISNULL(MAX(id)+1,1) FROM Ghre_ExternalTrainApplyOrder_Boltone WHERE Id !='{id}'"; + var id1 = await Db.Ado.GetLongAsync(sql); + sql = $"UPDATE Ghre_ExternalTrainApplyOrder_Boltone SET Id={id1} WHERE Id ='{id}'"; + await Db.Ado.ExecuteCommandAsync(sql); + + id = id1; + #endregion + + break; + } + #endregion + break; } diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExternalTrainApplyOrder_BoltoneServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExternalTrainApplyOrder_BoltoneServices.cs new file mode 100644 index 00000000..9f9824dc --- /dev/null +++ b/Tiobon.Core.Services/Ghre/Ghre_ExternalTrainApplyOrder_BoltoneServices.cs @@ -0,0 +1,15 @@ +namespace Tiobon.Core.Services; + +/// +/// 外训申请_宝连通 (服务) +/// +public class Ghre_ExternalTrainApplyOrder_BoltoneServices : BaseServices, IGhre_ExternalTrainApplyOrder_BoltoneServices +{ + private readonly IBaseRepository _dal; + public Ghre_ExternalTrainApplyOrder_BoltoneServices(ICaching caching, IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } +} \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ExternalTrainApplyOrder_BoltoneServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ExternalTrainApplyOrder_BoltoneServices.cs deleted file mode 100644 index 9f44d9c6..00000000 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ExternalTrainApplyOrder_BoltoneServices.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Tiobon.Core.Services; - -/// -/// 外训申请_宝连通 (服务) -/// -public class Ghrh_ExternalTrainApplyOrder_BoltoneServices : BaseServices, IGhrh_ExternalTrainApplyOrder_BoltoneServices -{ - private readonly IBaseRepository _dal; - public Ghrh_ExternalTrainApplyOrder_BoltoneServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } -} \ No newline at end of file diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 365308a7..0a3a0550 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -5055,6 +5055,276 @@ 预留字段12 + + + 外训申请_宝连通 (Dto.Base) + + + + + 发起时间 + + + + + 发起人ID + + + + + 发起人部门ID + + + + + 培训类型 + + + + + 受训人员 + + + + + 培训开始时间 + + + + + 培训结束时间 + + + + + 培训地点 + + + + + 培训机构 + + + + + 课程ID + + + + + 课程大纲 + + + + + 受训目的 + + + + + 费用 + + + + + 是否签订服务协议 + + + + + 服务协议 + + + + + 服务协议开始日期 + + + + + 服务协议结束日期 + + + + + 培训结果 + + + + + 证件类型 + + + + + 证件编号 + + + + + 证件有效开始日期 + + + + + 证件有效结束日期 + + + + + 培训机构评价 + + + + + 培训成果确认 + + + + + WorkID + + + + + WorkNo + + + + + ToDoType + + + + + BatchSID + + + + + WorkState + + + + + ShiftID + + + + + ConfirmUserID + + + + + ConfirmTime + + + + + ConfirmComment + + + + + 同意人 + + + + + 同意时间 + + + + + 同意理由 + + + + + 拒绝人 + + + + + 拒绝时间 + + + + + 拒绝理由 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + 多岗维护 (Dto.Base) @@ -15797,6 +16067,11 @@ Ghre_ExamStaff (Dto.EditInput) + + + 外训申请_宝连通 (Dto.EditInput) + + 多岗维护 (Dto.EditInput) @@ -16373,6 +16648,11 @@ Ghre_ExamStaff (Dto.InsertInput) + + + 外训申请_宝连通 (Dto.InsertInput) + + 多岗维护 (Dto.InsertInput) @@ -21972,6 +22252,276 @@ 预留字段12 + + + 外训申请_宝连通 (Model) + + + + + 发起时间 + + + + + 发起人ID + + + + + 发起人部门ID + + + + + 培训类型 + + + + + 受训人员 + + + + + 培训开始时间 + + + + + 培训结束时间 + + + + + 培训地点 + + + + + 培训机构 + + + + + 课程ID + + + + + 课程大纲 + + + + + 受训目的 + + + + + 费用 + + + + + 是否签订服务协议 + + + + + 服务协议 + + + + + 服务协议开始日期 + + + + + 服务协议结束日期 + + + + + 培训结果 + + + + + 证件类型 + + + + + 证件编号 + + + + + 证件有效开始日期 + + + + + 证件有效结束日期 + + + + + 培训机构评价 + + + + + 培训成果确认 + + + + + WorkID + + + + + WorkNo + + + + + ToDoType + + + + + BatchSID + + + + + WorkState + + + + + ShiftID + + + + + ConfirmUserID + + + + + ConfirmTime + + + + + ConfirmComment + + + + + 同意人 + + + + + 同意时间 + + + + + 同意理由 + + + + + 拒绝人 + + + + + 拒绝时间 + + + + + 拒绝理由 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + 多岗维护 (Model) @@ -34028,6 +34578,21 @@ 修改信息 + + + 外训申请_宝连通(Dto.View1) + + + + + 创建信息 + + + + + 修改信息 + + 多岗维护(Dto.View1) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index e3e8b93a..ccc09d81 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -1068,6 +1068,11 @@ Ghre_ExamStaff(Controller) + + + 外训申请_宝连通(Controller) + + 多岗维护(Controller)