【牛尾】培训需求新增外训机构维护

master
xiaochanghai 2 months ago
parent 988577dd47
commit 62993153c7
  1. 5632
      Model/Tiobon.Web.pdm
  2. 10
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 8
      Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs
  4. 8
      Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs
  5. 4
      Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs

File diff suppressed because it is too large Load Diff

@ -7150,6 +7150,11 @@
系统内置 系统内置
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.OutSideOrg">
<summary>
外训机构
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase">
<summary> <summary>
必选修查询 (Dto.Base) 必选修查询 (Dto.Base)
@ -25527,6 +25532,11 @@
系统内置 系统内置
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.OutSideOrg">
<summary>
外训机构
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse"> <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse">
<summary> <summary>
必选修查询 (Model) 必选修查询 (Model)

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/4/8 11:44:56 SimonHsiao *V0.01 2025/4/25 15:13:56 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -322,4 +322,10 @@ public class Ghre_RequestBase
/// 系统内置 /// 系统内置
/// </summary> /// </summary>
public int? BuiltIn { get; set; } public int? BuiltIn { get; set; }
/// <summary>
/// 外训机构
/// </summary>
[Display(Name = "OutSideOrg"), Description("外训机构"), MaxLength(128, ErrorMessage = "外训机构 不能超过 128 个字符")]
public string OutSideOrg { get; set; }
} }

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/4/8 11:44:56 SimonHsiao *V0.01 2025/4/25 15:13:56 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -323,4 +323,10 @@ public class Ghre_Request : BasePoco
/// 系统内置 /// 系统内置
/// </summary> /// </summary>
public int? BuiltIn { get; set; } public int? BuiltIn { get; set; }
/// <summary>
/// 外训机构
/// </summary>
[Display(Name = "OutSideOrg"), Description("外训机构"), MaxLength(128, ErrorMessage = "外训机构 不能超过 128 个字符")]
public string OutSideOrg { get; set; }
} }

@ -693,7 +693,7 @@ FROM Ghre_Request A
CreateProg, CreateProg,
DeptNo, DeptNo,
StaffNo, StaffNo,
LastUpdateDate,TrainStaffId,TrainClass,InOrOut) LastUpdateDate,TrainStaffId,TrainClass,InOrOut,OutSideOrg)
SELECT A.Id, SELECT A.Id,
A.RequestSource, A.RequestSource,
c.DeptName, c.DeptName,
@ -714,7 +714,7 @@ FROM Ghre_Request A
SELECT ',' + S.StaffNo SELECT ',' + S.StaffNo
FROM OPENJSON(A.TrainStaffId) WITH (TrainStaffId INT '$') AS JsonData FROM OPENJSON(A.TrainStaffId) WITH (TrainStaffId INT '$') AS JsonData
INNER JOIN Ghra_Staff S ON JsonData.TrainStaffId = S.StaffID INNER JOIN Ghra_Staff S ON JsonData.TrainStaffId = S.StaffID
FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS StaffNames,A.TrainClass,A.InOrOut FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS StaffNames,A.TrainClass,A.InOrOut,OutSideOrg
FROM Ghre_Request A FROM Ghre_Request A
LEFT JOIN [120.26.205.42].[GhrUshio].[dbo].Ghre_GHR50Request B LEFT JOIN [120.26.205.42].[GhrUshio].[dbo].Ghre_GHR50Request B
ON B.RequestID = A.Id ON B.RequestID = A.Id

Loading…
Cancel
Save