From e6b16a6f5eff2068adf62c3072d63f54150859f5 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Tue, 27 May 2025 15:15:01 +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=E5=A4=96=E8=AE=AD=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E8=AE=B2=E5=B8=88=E5=90=8D?= 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 | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 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 859f3013..9bbb91e7 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 @@ -33,6 +33,7 @@ public class Ghre_TrainFeeApplyOrder_BoltoneDto : Ghre_TrainFeeApplyOrder_Bolton public string UpdateDataInfo { get; set; } public string ApplicantName { get; set; } public string ApplicantDeptName { get; set; } + public string StaffNo { get; set; } public string TeacherName { get; set; } public string DeptName { get; set; } public string IsApplyFee1 { get; set; } diff --git a/Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs index 04c51e46..2e05ca24 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs @@ -50,21 +50,30 @@ public class Ghre_TrainFeeApplyOrder_BoltoneServices : BaseServices x.DeptID == DT_TableDataT1[i].DeptId)?.DeptName; if (DT_TableDataT1[i].TeacherId.IsNotEmptyOrNull()) + { + DT_TableDataT1[i].StaffNo = staffs.FirstOrDefault(x => x.StaffID == DT_TableDataT1[i].TeacherId)?.StaffNo; 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) + if (DT_TableDataT1[i].PlanId.IsNotEmptyOrNull()) { + var planIds = JsonHelper.JsonToObj>(DT_TableDataT1[i].PlanId); 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); - + for (int j = 0; j < planIds.Count; j++) + { + string sql = commonSql.SqlIDToName.Replace("{@KeyWords}", planIds[j].ObjToString()); + if (j == 0) + DT_TableDataT1[i].PlanName = await Db.Ado.GetStringAsync(sql); + else + DT_TableDataT1[i].PlanName += "、" + await Db.Ado.GetStringAsync(sql); + } } }