优化 流程 年度人力配置申请查询

Tiobon.Core.Model/View/Ghrh/Ghrh_YearHumanApplyOrder.Dto.View.cs

@@ -32,5 +32,5 @@ public class Ghrh_YearHumanApplyOrderDto : Ghrh_YearHumanApplyOrder
     /// </summary>
     public string UpdateDataInfo { get; set; }
 
-    public List<Ghrh_YearHumanSettings> Items { get; set; }
+    public List<Ghrh_YearHumanSettingsDto> Items { get; set; }
 }

Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs

@@ -1,4 +1,6 @@
-namespace Tiobon.Core.Services;
+using System.Data;
+
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 年度人力申请 (服务)
@@ -19,7 +21,56 @@ public class Ghrh_YearHumanApplyOrderServices : BaseServices<Ghrh_YearHumanApply
     {
         var entity = await base.QuerySingleDto(x => x.WorkID == objId);
         if (entity != null)
-            entity.Items = await Db.Queryable<Ghrh_YearHumanSettings>().Where(x => x.OrderId == entity.Id).ToListAsync();
+        {
+            var items = await Db.Queryable<Ghrh_YearHumanSettings>().Where(x => x.OrderId == entity.Id).ToListAsync();
+
+            entity.Items = Mapper.Map(items).ToANew<List<Ghrh_YearHumanSettingsDto>>();
+            if (entity.Items.Any())
+            {
+
+                var deptIds = entity.Items.Select(x => x.DeptId).Distinct().ToList();
+                var titleIds = entity.Items.Select(x => x.TitleId).Distinct().ToList();
+                var jobIds = entity.Items.Select(x => x.JobId).Distinct().ToList();
+                var gradeIds = entity.Items.Select(x => x.GradeId).Distinct().ToList();
+
+                if (deptIds.Any())
+                {
+                    var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID)).Select(x => new { x.DeptID, x.DeptName }).ToListAsync();
+                    entity.Items.ForEach(x => x.DeptName = depts.FirstOrDefault(o => x.DeptId == o.DeptID)?.DeptName);
+                }
+
+                if (titleIds.Any())
+                {
+                    var titles = await Db.Queryable<Ghra_Title>().Where(x => titleIds.Contains(x.TitleID)).ToListAsync();
+
+                    entity.Items.ForEach(rule =>
+                    {
+                        rule.TitleName = titles.FirstOrDefault(o => rule.TitleId == o.TitleID)?.TitleName;
+                    });
+                }
+
+                if (gradeIds.Any())
+                {
+                    var grades = await Db.Queryable<Ghra_Grade>().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync();
+
+                    entity.Items.ForEach(rule =>
+                    {
+                        rule.GradeName = grades.FirstOrDefault(o => rule.GradeId == o.GradeID)?.GradeName;
+                    });
+                }
+
+                if (jobIds.Any())
+                {
+                    var jobs = await Db.Queryable<Ghra_Job>().Where(x => jobIds.Contains(x.JobID)).ToListAsync();
+
+                    entity.Items.ForEach(rule =>
+                    {
+                        rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName;
+                    });
+                }
+            }
+        }
+
         return ServiceResult<Ghrh_YearHumanApplyOrderDto>.OprateSuccess("查询成功！", entity);
 
     }

Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs

@@ -242,7 +242,19 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
         flowReturn.result.JM_TableColumnT1.TableColumn = flowReturn.result.JM_TableColumnT1.TableColumn.OrderBy(x => x.rowNum).ToList();
         #endregion
 
-        return ServiceResult<List<FlowTableColumn>>.OprateSuccess("查询成功！", flowReturn.result.JM_TableColumnT1.TableColumn); ;
+        flowReturn.result.JM_TableColumnT1.TableColumn.ForEach(x =>
+        {
+            if (x.field == "DeptId")
+                x.field = "DeptName";
+            else if (x.field == "TitleId")
+                x.field = "TitleName";
+            else if (x.field == "JobId")
+                x.field = "JobName";
+            else if (x.field == "GradeId")
+                x.field = "GradeName";
+        });
+
+        return ServiceResult<List<FlowTableColumn>>.OprateSuccess("查询成功！", flowReturn.result.JM_TableColumnT1.TableColumn);
 
     }