宝连通【讲师费用申请】修改

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

@@ -5535,6 +5535,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExternalTrainApplyOrder_BoltoneBase.SchoolName1">
+            <summary>
+            SchoolName1
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExternalTrainApplyOrder_BoltoneBase.CourseName1">
+            <summary>
+            CourseName1
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_MultipleTitleBase">
             <summary>
             多岗维护 (Dto.Base)
@@ -23922,6 +23932,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExternalTrainApplyOrder_Boltone.SchoolName1">
+            <summary>
+            SchoolName1
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExternalTrainApplyOrder_Boltone.CourseName1">
+            <summary>
+            CourseName1
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_MultipleTitle">
             <summary>
             多岗维护 (Model)

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

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/4/11 11:35:25  SimonHsiao   初版
+*V0.01  2025/4/25 12:00:26  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -319,6 +319,19 @@ public class Ghre_ExternalTrainApplyOrder_BoltoneBase
     /// </summary>
     public int? ReverseI2 { get; set; }
 
+    /// <summary>
+    /// SchoolName1
+    /// </summary>
+    [Display(Name = "SchoolName1"), Description("SchoolName1"), MaxLength(128, ErrorMessage = "SchoolName1 不能超过 128 个字符")]
+    public string SchoolName1 { get; set; }
+
+    /// <summary>
+    /// CourseName1
+    /// </summary>
+    [Display(Name = "CourseName1"), Description("CourseName1"), MaxLength(128, ErrorMessage = "CourseName1 不能超过 128 个字符")]
+    public string CourseName1 { get; set; }
+
+
     public List<Ghre_Attachment1> ExternalAttachments { get; set; } = new List<Ghre_Attachment1>();
 
     public List<Ghre_Attachment1> ContractAttachments { get; set; } = new List<Ghre_Attachment1>();
@@ -328,3 +341,4 @@ public class Ghre_ExternalTrainApplyOrder_BoltoneBase
     public string AttachmentTemplateLink { get; set; } = "/Advanced/files/外训申请附件.zip"
 ;
 }
+

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

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/4/11 11:35:25  SimonHsiao   初版
+*V0.01  2025/4/25 12:00:26  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -18,8 +18,8 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using SqlSugar;
 
-namespace Tiobon.Core.Model.Models
+namespace Tiobon.Core.Model.Models;
-{
+
 
 /// <summary>
 /// 外训申请_宝连通 (Model)
@@ -321,5 +321,16 @@ namespace Tiobon.Core.Model.Models
     /// 预留字段12
     /// </summary>
     public int? ReverseI2 { get; set; }
-    }
+
+    /// <summary>
+    /// SchoolName1
+    /// </summary>
+    [Display(Name = "SchoolName1"), Description("SchoolName1"), MaxLength(128, ErrorMessage = "SchoolName1 不能超过 128 个字符")]
+    public string SchoolName1 { get; set; }
+
+    /// <summary>
+    /// CourseName1
+    /// </summary>
+    [Display(Name = "CourseName1"), Description("CourseName1"), MaxLength(128, ErrorMessage = "CourseName1 不能超过 128 个字符")]
+    public string CourseName1 { get; set; }
 }

Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs

@@ -145,7 +145,8 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
                 i++;
             });
             condition += ")";
-        }
+        }else
+            condition += $" AND 1!=1";
 
         var result2 = await _staffServices.QueryFilterPage(filter, condition);
 
@@ -165,6 +166,10 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
         {
             var column = result2.result.DT_TableDataT1[i];
 
+            var reverse16 = column.Reverse16;
+            if (reverse16.IsNotEmptyOrNull())
+                reverse16 = await GetParaLabel(reverse16.ObjToInt());
+
             var item1 = new JObject
             {
                 new JProperty("StaffID", column.StaffID),
@@ -172,7 +177,7 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
                 new JProperty("IndateLabel",  column.IndateLabel),
                 new JProperty("StaffNo",  column.StaffNo),
                 new JProperty("StaffName",  column.StaffName),
-                new JProperty("StaffType1Label",  column.StaffType1Label),
+                new JProperty("StaffType1Label",  reverse16),
                 new JProperty("TitleName",  column.TitleName),
             };
             //×	生手 技能有效期内所对应课程还未分配或课程学习时长为0							

Tiobon.Core/Tiobon.Core.Model.xml

@@ -5535,6 +5535,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExternalTrainApplyOrder_BoltoneBase.SchoolName1">
+            <summary>
+            SchoolName1
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExternalTrainApplyOrder_BoltoneBase.CourseName1">
+            <summary>
+            CourseName1
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_MultipleTitleBase">
             <summary>
             多岗维护 (Dto.Base)
@@ -23922,6 +23932,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExternalTrainApplyOrder_Boltone.SchoolName1">
+            <summary>
+            SchoolName1
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExternalTrainApplyOrder_Boltone.CourseName1">
+            <summary>
+            CourseName1
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_MultipleTitle">
             <summary>
             多岗维护 (Model)