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; /// /// 培训费用_宝连通 (服务) @@ -30,7 +28,6 @@ public class Ghre_TrainFeeApplyOrder_BoltoneServices : BaseServices x.ApplicantId).Distinct().ToList(); staffIds.AddRange(teacherIds); staffIds = staffIds.Distinct().ToList(); @@ -56,6 +53,21 @@ public class Ghre_TrainFeeApplyOrder_BoltoneServices : BaseServices 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().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;