培训费用讲师查询页面

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

@@ -35863,6 +35863,11 @@
             部门
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.ParentDeptName">
+            <summary>
+            部门
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.TitleName">
             <summary>
             岗位

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

@@ -287,4 +287,5 @@ public class Ghre_TrainFeeApplyOrder_BoltoneBase
     public int? ReverseI2 { get; set; }
 
     public List<Ghre_Attachment1> Attachments { get; set; } = new List<Ghre_Attachment1>();
+    public List<Ghre_TrainFeeApplyDetail_Boltone> Details { get; set; } = new List<Ghre_TrainFeeApplyDetail_Boltone>();
 }

Tiobon.Core.Model/View/Ghra/Ghra_Staff.Dto.View.cs

@@ -64,6 +64,11 @@ public class Ghra_StaffDto : Ghra_Staff
     /// </summary>
     public string DeptName { get; set; }
 
+    /// <summary>
+    /// 部门
+    /// </summary>
+    public string ParentDeptName { get; set; }
+
     /// <summary>
     /// 岗位
     /// </summary>
@@ -81,4 +86,5 @@ public class Ghra_StaffDto : Ghra_Staff
 
     public int? TitleId { get; set; }
     public int? DeptId { get; set; }
+    public int? ParentDeptId { get; set; }
 }

Tiobon.Core.Model/View/Ghre/Ghre_TrainFeeApplyOrder_Boltone.Dto.View.cs

@@ -31,4 +31,11 @@ public class Ghre_TrainFeeApplyOrder_BoltoneDto : Ghre_TrainFeeApplyOrder_Bolton
     /// 修改信息
     /// </summary>
     public string UpdateDataInfo { get; set; }
+    public string ApplicantName { get; set; }
+    public string ApplicantDeptName { get; set; }
+    public string TeacherName { get; set; }
+    public string DeptName { get; set; }
+    public string IsApplyFee1 { get; set; }
+
+
 }

Tiobon.Core.Services/CommonServices.cs

@@ -3941,9 +3941,9 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
             case "F_ESS_TrainFeeApplyOrder_Boltone":
                 if (param.doType == "Insert")
                 {
-                    flowReturn.DT_TableDataT1 = new List<Ghre_TrainFeeApplyOrder_Boltone>()
+                    flowReturn.DT_TableDataT1 = new List<InsertGhre_TrainFeeApplyOrder_BoltoneInput>()
                     {
-                        new Ghre_TrainFeeApplyOrder_Boltone()
+                        new InsertGhre_TrainFeeApplyOrder_BoltoneInput()
                     {
                         ApplicantId = App.User.StaffId,
                         ApplicantDeptId = GetStaffDeptId(),
@@ -4358,7 +4358,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
 
                         #region  写入数据,并判断是否有错误
                         string json = param.jsonParam.ToString();
-                        var dict = JsonHelper.JsonToObj<Ghre_ExternalTrainApplyOrder_Boltone>(json);
+                        var dict = JsonHelper.JsonToObj<Ghre_TrainFeeApplyOrder_Boltone>(json);
                         var dict1 = JsonHelper.JsonToObj<Ghre_TrainFeeApplyOrder_BoltoneBase>(json);
                         //dict.RequestNo = await GenerateContinuousSequence("Ghrh_HumanRequest", "RequestNo", "R");
                         id = await Db.Insertable(dict).ExecuteReturnSnowflakeIdAsync();
@@ -4370,6 +4370,14 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
 
                         id = id1;
 
+
+                        dict1.Details.ForEach(x =>
+                        {
+                            x.OrderId = id;
+                            x.Id = SnowFlakeSingle.Instance.NextId();
+                        });
+                        await Db.Insertable(dict1.Details).ExecuteCommandAsync();
+
                         if (dict1.Attachments.Any())
                         {
                             var ids = dict1.Attachments.Select(x => x.AttachmentID).ToList();

Tiobon.Core.Services/Ghra/Ghra_StaffServices.cs

@@ -53,6 +53,19 @@ public class Ghra_StaffServices : BaseServices<Ghra_Staff, Ghra_StaffDto, Insert
         {
             entity.TitleId = entity.TitleID;
             entity.DeptId = entity.DeptID;
+
+            if (entity.DeptId != null)
+            {
+                var dept = await Db.Queryable<Ghro_Dept>().Where(x => x.DeptID == entity.DeptId).FirstAsync();
+
+                if (dept != null)
+                    entity.DeptName = dept.DeptName;
+
+                dept = await Db.Queryable<Ghro_Dept>().Where(x => x.ParentDeptID == entity.DeptId).FirstAsync();
+                if (dept != null)
+                    entity.ParentDeptName = dept.DeptName;
+            }
+
             var licences = await Db.Ado.SqlQueryAsync<Ghra_StaffLicenceDto>($"SELECT * FROM Ghra_StaffLicence WHERE StaffID='{id}'  AND IsEnable=1");
             //var licences = await _ghra_StaffLicenceServices.QueryDto(x => x.StaffID == id);
 

Tiobon.Core.Services/Ghre/Ghre_TrainFeeApplyOrder_BoltoneServices.cs

@@ -1,4 +1,6 @@
-namespace Tiobon.Core.Services;
+using Tiobon.Core.IServices;
+
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 培训费用_宝连通 (服务)
@@ -12,4 +14,51 @@ public class Ghre_TrainFeeApplyOrder_BoltoneServices : BaseServices<Ghre_TrainFe
         base.BaseDal = dal;
         base._caching = caching;
     }
+
+    public override async Task<ServicePageResult<Ghre_TrainFeeApplyOrder_BoltoneDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
+    {
+
+        var result = await base.QueryFilterPage(filter, "WorkState=1", IsEnable);
+
+        var DT_TableDataT1 = result.result.DT_TableDataT1;
+
+        var applicantDeptIds = DT_TableDataT1.Select(x => x.ApplicantDeptId).Distinct().ToList();
+        var deptIds = DT_TableDataT1.Select(x => x.DeptId).Distinct().ToList();
+        var teacherIds = DT_TableDataT1.Select(x => x.TeacherId).Distinct().ToList();
+        deptIds.AddRange(applicantDeptIds);
+        deptIds = deptIds.Distinct().ToList();
+
+
+
+
+        var staffIds = DT_TableDataT1.Select(x => x.ApplicantId).Distinct().ToList();
+        staffIds.AddRange(teacherIds);
+        staffIds = staffIds.Distinct().ToList();
+
+        var staffs = await Db.Queryable<Ghra_Staff>().Where(x => staffIds.Contains(x.StaffID)).ToListAsync();
+        var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID)).ToListAsync();
+
+
+        for (int i = 0; i < DT_TableDataT1.Count; i++)
+        {
+            DT_TableDataT1[i].InOrOut = await GetParaLabel("CourseInOrOut", DT_TableDataT1[i].InOrOut);
+            DT_TableDataT1[i].TrainFeeCourseType = await GetParaLabel("TrainFeeCourseType-Boltone", DT_TableDataT1[i].TrainFeeCourseType);
+            DT_TableDataT1[i].TrainTimeType = await GetParaLabel("TrainTimeType-Boltone", DT_TableDataT1[i].TrainTimeType);
+            if (DT_TableDataT1[i].ApplicantId.IsNotEmptyOrNull())
+                DT_TableDataT1[i].ApplicantName = staffs.FirstOrDefault(x => x.StaffID == DT_TableDataT1[i].ApplicantId)?.StaffName;
+
+            if (DT_TableDataT1[i].ApplicantDeptId.IsNotEmptyOrNull())
+                DT_TableDataT1[i].ApplicantDeptName = depts.FirstOrDefault(x => x.DeptID == DT_TableDataT1[i].ApplicantDeptId)?.DeptName;
+
+            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].TeacherName = staffs.FirstOrDefault(x => x.StaffID == DT_TableDataT1[i].TeacherId)?.StaffName;
+
+            DT_TableDataT1[i].IsApplyFee1 = DT_TableDataT1[i].IsApplyFee == 1 ? "是" : "否";
+        }
+
+        return result;
+    }
+
 }

Tiobon.Core.Services/Ghrh/Ghrh_TemplateServices.cs

@@ -109,7 +109,8 @@ public class Ghrh_TemplateServices : BaseServices<Ghrh_Template, Ghrh_TemplateDt
             result = result.Replace("[Mobile_EN]", resume.Mobile);
             result = result.Replace("[Email_EN]", resume.Email);
             result = result.Replace("[IdCardNo_EN]", resume.IdCardNo);
-            var offerApplyOrder = await Db.Queryable<Ghrh_OfferApplyOrder>().Where(x => x.ResumeId == resumeId).OrderByDescending(x => x.ApplyTime).SingleAsync();
+            var offerApplyOrder = await Db.Queryable<Ghrh_OfferApplyOrder>().Where(x => x.ResumeId == resumeId)
+                .OrderByDescending(x => x.ApplyTime).FirstAsync();
 
             if (offerApplyOrder != null)
             {

Tiobon.Core/Tiobon.Core.Model.xml

@@ -35863,6 +35863,11 @@
             部门
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.ParentDeptName">
+            <summary>
+            部门
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghra_StaffDto.TitleName">
             <summary>
             岗位