人力需求维护页面开发

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

@@ -27717,6 +27717,31 @@
             性别
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.ImportanceDegreeLabel">
+            <summary>
+            重要度
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.YearHumanName">
+            <summary>
+            年度人力配置单
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.ReportName">
+            <summary>
+            汇报对象
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.InTime1">
+            <summary>
+            建议到岗时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.AgeLabel">
+            <summary>
+            年龄
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_HumanRequestDetailDto">
             <summary>
             人力需求维护明细(Dto.View1)

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

@@ -72,4 +72,27 @@ public class Ghrh_HumanRequestDto : Ghrh_HumanRequest
     /// </summary>
     public string GenderLabel { get; set; }
 
+    /// <summary>
+    /// 重要度
+    /// </summary>
+    public string ImportanceDegreeLabel { get; set; }
+
+    /// <summary>
+    /// 年度人力配置单
+    /// </summary>
+    public string YearHumanName { get; set; }
+
+    /// <summary>
+    /// 汇报对象
+    /// </summary>
+    public string ReportName { get; set; }
+
+    /// <summary>
+    /// 建议到岗时间
+    /// </summary>
+    public string InTime1 { get; set; }
+    /// <summary>
+    /// 年龄
+    /// </summary>
+    public string AgeLabel { get; set; }
 }

Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
+namespace Tiobon.Core.Services;
-
-namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 人力需求维护 (服务)
@@ -26,6 +24,10 @@ public class Ghrh_HumanRequestServices : BaseServices<Ghrh_HumanRequest, Ghrh_Hu
         {
             x.GenderLabel = await GetParaLabel("Gender", x.Gender);
             x.InOrOutLabel = await GetParaLabel("ResumeBudgetTypr", x.InOrOut);
+            x.ImportanceDegreeLabel = await GetParaLabel("ResumeImportanceDegree", x.ImportanceDegree);
+            x.InTime1 = DateTimeHelper.ConvertToDayString(x.InTime);
+            x.AgeLabel = DateTimeHelper.ConvertToDayString(x.Age);
+            //x.AgeLabel = DateTimeHelper.ConvertToDayString(x.Age);
         }
     }
     #endregion
@@ -38,6 +40,18 @@ public class Ghrh_HumanRequestServices : BaseServices<Ghrh_HumanRequest, Ghrh_Hu
         var gradeIds = entitys.Where(x => x.GradeId != null).Select(x => x.GradeId).ToList();
         var jobIds = entitys.Where(x => x.JobId != null).Select(x => x.JobId).ToList();
         var titleIds = entitys.Where(x => x.TitleId != null).Select(x => x.TitleId).ToList();
+        var reportIds = entitys.Where(x => x.ReportId != null).Select(x => x.ReportId).ToList();
+
+        if (reportIds.Any())
+        {
+            var staffs = await Db.Queryable<Ghra_Staff>().Where(x => reportIds.Contains(x.StaffID)).ToListAsync();
+
+            entitys.ForEach(rule =>
+            {
+                rule.ReportName = staffs.FirstOrDefault(o => rule.DeptId == o.DeptID)?.StaffName;
+            });
+        }
+
         if (deptIds.Any())
         {
             var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID)).ToListAsync();
@@ -77,6 +91,17 @@ public class Ghrh_HumanRequestServices : BaseServices<Ghrh_HumanRequest, Ghrh_Hu
                 rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName;
             });
         }
+
+        for (int i = 0; i < entitys.Count; i++)
+        {
+            if (entitys[i].YearHumanId.IsNotEmptyOrNull())
+                entitys[i].YearHumanName = await Db.Ado.GetStringAsync(@$"SELECT CAST (A.[Year] AS VARCHAR) + '_' + B.TitleName + '_' + C.JobName label
+FROM Ghrh_YearHumanSettings A
+     LEFT JOIN Ghra_Title B ON A.TitleId = B.TitleID
+     LEFT JOIN Ghra_Job C ON A.JobId = C.JobID
+WHERE A.IsEnable = 1 AND A.Id = {entitys[i].YearHumanId}");
+        }
+
         entitys.ForEach(async x =>
         {
             await SetLabel(x);

Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs

@@ -20,7 +20,30 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
         _commonServices = commonServices;
     }
 
-
+    #region 字典映射、全称、单位转换等
+    /// <summary>
+    /// 字典映射、全称、单位转换等
+    /// </summary>
+    /// <param name="view"></param>
+    private async Task SetLabel(Ghrh_YearHumanSettingsDto data)
+    {
+        if (data != null)
+        {
+            data.M1_F = data.M1 + (data.M1_A ?? 0);
+            data.M2_F = data.M2 + (data.M2_A ?? 0);
+            data.M3_F = data.M3 + (data.M3_A ?? 0);
+            data.M4_F = data.M4 + (data.M4_A ?? 0);
+            data.M5_F = data.M5 + (data.M5_A ?? 0);
+            data.M6_F = data.M6 + (data.M6_A ?? 0);
+            data.M7_F = data.M7 + (data.M7_A ?? 0);
+            data.M8_F = data.M8 + (data.M8_A ?? 0);
+            data.M9_F = data.M9 + (data.M9_A ?? 0);
+            data.M10_F = data.M10 + (data.M10_A ?? 0);
+            data.M11_F = data.M11 + (data.M11_A ?? 0);
+            data.M12_F = data.M12 + (data.M12_A ?? 0);
+        }
+    }
+    #endregion
 
     public override async Task<long> Add(InsertGhrh_YearHumanSettingsInput entity)
     {
@@ -100,21 +123,9 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
                 rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName;
             });
         }
-
+        entitys.ForEach(async x =>
-        entitys.ForEach(data =>
         {
-            data.M1_F = data.M1 + (data.M1_A ?? 0);
+            await SetLabel(x);
-            data.M2_F = data.M2 + (data.M2_A ?? 0);
-            data.M3_F = data.M3 + (data.M3_A ?? 0);
-            data.M4_F = data.M4 + (data.M4_A ?? 0);
-            data.M5_F = data.M5 + (data.M5_A ?? 0);
-            data.M6_F = data.M6 + (data.M6_A ?? 0);
-            data.M7_F = data.M7 + (data.M7_A ?? 0);
-            data.M8_F = data.M8 + (data.M8_A ?? 0);
-            data.M9_F = data.M9 + (data.M9_A ?? 0);
-            data.M10_F = data.M10 + (data.M10_A ?? 0);
-            data.M11_F = data.M11 + (data.M11_A ?? 0);
-            data.M12_F = data.M12 + (data.M12_A ?? 0);
         });
 
         result.result.DT_TableDataT1 = entitys;
@@ -153,23 +164,22 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
 
         var data = result.result.DT_TableDataT1[0];
         data.StartMonth = config != null ? config.ConfigValue.ObjToInt() : 1;
-        data.M1_F = data.M1 + (data.M1_A ?? 0);
+       
-        data.M2_F = data.M2 + (data.M2_A ?? 0);
+        await SetLabel(data);
-        data.M3_F = data.M3 + (data.M3_A ?? 0);
-        data.M4_F = data.M4 + (data.M4_A ?? 0);
-        data.M5_F = data.M5 + (data.M5_A ?? 0);
-        data.M6_F = data.M6 + (data.M6_A ?? 0);
-        data.M7_F = data.M7 + (data.M7_A ?? 0);
-        data.M8_F = data.M8 + (data.M8_A ?? 0);
-        data.M9_F = data.M9 + (data.M9_A ?? 0);
-        data.M10_F = data.M10 + (data.M10_A ?? 0);
-        data.M11_F = data.M11 + (data.M11_A ?? 0);
-        data.M12_F = data.M12 + (data.M12_A ?? 0);
         result.result.DT_TableDataT1[0] = data;
         return result;
 
     }
 
+    public override async Task<Ghrh_YearHumanSettingsDto> QueryById(object objId)
+    {
+        var entity = await base.QueryById(objId);
+
+        await SetLabel(entity);
+
+        return entity;
+    }
+
     public async Task<ServiceResult<List<FlowTableColumn>>> QueryApplyColumn(int curentYear, int langId)
     {
         int flowId = await Db.Ado.GetIntAsync("Select FlowID from Ghrw_Flow where FlowNo='F_ESS_RecruitYearManpowerApply'");

Tiobon.Core/Tiobon.Core.Model.xml

@@ -20549,7 +20549,7 @@
         <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequest.GradeId">
             <summary>
             职等ID
-            </summary>
+            </summary> 
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequest.RequestCount">
             <summary>
@@ -27682,6 +27682,11 @@
             部门
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.JobName">
+            <summary>
+            职称
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.TitleName">
             <summary>
             岗位
@@ -27702,6 +27707,41 @@
             部门负责人邮箱
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.InOrOutLabel">
+            <summary>
+            编制内外
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.GenderLabel">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.ImportanceDegreeLabel">
+            <summary>
+            重要度
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.YearHumanName">
+            <summary>
+            年度人力配置单
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.ReportName">
+            <summary>
+            汇报对象
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.InTime1">
+            <summary>
+            建议到岗时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_HumanRequestDto.AgeLabel">
+            <summary>
+            年龄
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrh_HumanRequestDetailDto">
             <summary>
             人力需求维护明细(Dto.View1)