From e7210e087d08d4accd336ccec091f7a8c1f4a1e7 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Wed, 21 May 2025 17:18:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=96=B0=E5=A2=9E=E3=80=90=E5=AF=B9=E5=BA=94=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E3=80=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...hre_TrainFeeApplyOrder_Boltone.Dto.View.cs |  1 +
 ...Ghre_TrainFeeApplyOrder_BoltoneServices.cs | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_TrainFeeApplyOrder_Boltone.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_TrainFeeApplyOrder_Boltone.Dto.View.cs
index e4e7098f..859f3013 100644
--- a/Tiobon.Core.Model/View/Ghre/Ghre_TrainFeeApplyOrder_Boltone.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghre/Ghre_TrainFeeApplyOrder_Boltone.Dto.View.cs
@@ -37,5 +37,6 @@ public class Ghre_TrainFeeApplyOrder_BoltoneDto : Ghre_TrainFeeApplyOrder_Bolton
     public string DeptName { get; set; }
     public string IsApplyFee1 { get; set; }
 
+    public string PlanName { get; set; }
 
 }
diff --git a/Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs
index 583b3c03..04c51e46 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs
@@ -1,6 +1,4 @@
-using Tiobon.Core.IServices;
-
-namespace Tiobon.Core.Services;
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 培训费用_宝连通 (服务)
@@ -30,7 +28,6 @@ public class Ghre_TrainFeeApplyOrder_BoltoneServices : BaseServices<Ghre_TrainFe
 
 
 
-
         var staffIds = DT_TableDataT1.Select(x => x.ApplicantId).Distinct().ToList();
         staffIds.AddRange(teacherIds);
         staffIds = staffIds.Distinct().ToList();
@@ -56,6 +53,21 @@ public class Ghre_TrainFeeApplyOrder_BoltoneServices : BaseServices<Ghre_TrainFe
                 DT_TableDataT1[i].TeacherName = staffs.FirstOrDefault(x => x.StaffID == DT_TableDataT1[i].TeacherId)?.StaffName;
 
             DT_TableDataT1[i].IsApplyFee1 = DT_TableDataT1[i].IsApplyFee == 1 ? "是" : "否";
+
+            if (DT_TableDataT1[i].PlanId != null)
+            {
+
+                var commonSql = await Db.Queryable<Ghrs_ListCommonSql>().Where(o => o.ListCommonSqlNo == "TrainingPlan").FirstAsync();
+
+                if (commonSql != null)
+                {
+                    string sql = commonSql.SqlIDToName;
+                    sql = sql.Replace("{@KeyWords}", DT_TableDataT1[i].PlanId.ObjToString());
+                    DT_TableDataT1[i].PlanName = await Db.Ado.GetStringAsync(sql);
+
+                }
+            }
+
         }
 
         return result;