讲师费用申请新增外训输入讲师名

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; }

Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs

@@ -50,21 +50,30 @@ public class Ghre_TrainFeeApplyOrder_BoltoneServices : BaseServices<Ghre_TrainFe
             if (DT_TableDataT1[i].DeptId.IsNotEmptyOrNull())
                 DT_TableDataT1[i].DeptName = depts.FirstOrDefault(x => 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<List<long>>(DT_TableDataT1[i].PlanId);
                 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);
-
+                    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);
+                    }
                 }
             }