牛尾 培训需求、培训计划修改

Tiobon.Core.Api/Tiobon.Core.Model.xml

@@ -7375,6 +7375,11 @@
             外训机构
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.SchoolId">
+            <summary>
+            培训机构ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase">
             <summary>
             必选修查询 (Dto.Base)
@@ -26012,6 +26017,11 @@
             外训机构
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Request.SchoolId">
+            <summary>
+            培训机构ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse">
             <summary>
             必选修查询 (Model)

Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/4/25 15:13:56  SimonHsiao   初版
+*V0.01  2025/5/7 9:17:56  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -328,4 +328,9 @@ public class Ghre_RequestBase
     /// </summary>
     [Display(Name = "OutSideOrg"), Description("外训机构"), MaxLength(128, ErrorMessage = "外训机构 不能超过 128 个字符")]
     public string OutSideOrg { get; set; }
+
+    /// <summary>
+    /// 培训机构ID
+    /// </summary>
+    public long? SchoolId { get; set; }
 }

Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/4/25 15:13:56  SimonHsiao   初版
+*V0.01  2025/5/7 9:17:56  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -329,4 +329,9 @@ public class Ghre_Request : BasePoco
     /// </summary>
     [Display(Name = "OutSideOrg"), Description("外训机构"), MaxLength(128, ErrorMessage = "外训机构 不能超过 128 个字符")]
     public string OutSideOrg { get; set; }
+
+    /// <summary>
+    /// 培训机构ID
+    /// </summary>
+    public long? SchoolId { get; set; }
 }

Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs

@@ -102,7 +102,7 @@ FROM Ghre_Request A
         if (entity.TrainStaffIds.IsNotEmptyOrNull())
             entity.TrainStaffId = JsonHelper.ObjToJson(entity.TrainStaffIds);
         entity.RequestNo = await GenerateContinuousSequence("Ghre_Request", "RequestNo", "R");
-        if (entity.CourseSource != "Dept")
+        if (entity.RequestSource != "Dept")
             entity.RequestNum = null;
 
         if (entity.RequestSource == "Dept")
@@ -590,7 +590,7 @@ FROM Ghre_Request A
         {
 
 
-            string sql = @"SELECT *, TrainStaffId TrainStaffId1
+            string sql = @"SELECT *, TrainStaffId TrainStaffId1, OutSideOrg SchoolId
                             FROM [120.26.205.42].[GhrUshio].[dbo].Ghrz_Ushio_TrainRequestApply_GHR50_V
                             WHERE     RequestNo NOT IN (SELECT RequestNo
                                                         FROM Ghre_Request
@@ -714,7 +714,7 @@ FROM Ghre_Request A
         SELECT ',' + S.StaffNo
         FROM OPENJSON(A.TrainStaffId) WITH (TrainStaffId INT '$') AS JsonData
         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,OutSideOrg
+        FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS StaffNames,A.TrainClass,A.InOrOut,SchoolId
    FROM Ghre_Request A
         LEFT JOIN [120.26.205.42].[GhrUshio].[dbo].Ghre_GHR50Request B
            ON B.RequestID = A.Id

Tiobon.Core/Tiobon.Core.Model.xml

@@ -7375,6 +7375,11 @@
             外训机构
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.SchoolId">
+            <summary>
+            培训机构ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase">
             <summary>
             必选修查询 (Dto.Base)
@@ -26012,6 +26017,11 @@
             外训机构
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Request.SchoolId">
+            <summary>
+            培训机构ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse">
             <summary>
             必选修查询 (Model)