年度人力配置设计表

年度人力配置设计表查询页面开发

Tiobon.Core.Api/Tiobon.Core.xml

@@ -736,6 +736,16 @@
             厂区(Controller)
             </summary>
         </member>
+        <member name="T:Tiobon.Core.Api.Controllers.Ghrc_PeriodMasterController">
+            <summary>
+            Ghrc_PeriodMaster(Controller)
+            </summary>
+        </member>
+        <member name="T:Tiobon.Core.Api.Controllers.Ghrc_SalaryItemController">
+            <summary>
+            Ghrc_SalaryItem(Controller)
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghre_AttachmentController">
             <summary>
             附件(Controller)
@@ -1775,6 +1785,11 @@
             系统用户(Controller)
             </summary>
         </member>
+        <member name="T:Tiobon.Core.Api.Controllers.Ghrz_Shihua_OA_EmploymentController">
+            <summary>
+            Ghrz_Shihua_OA_Employment(Controller)
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Systems.CacheManageController">
             <summary>
             缓存管理

Tiobon.Core.IServices/ICommonServices.cs

@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
-using System.Data;
 using Tiobon.Core.Common;
 using Tiobon.Core.IServices.BASE;
 using Tiobon.Core.Model;

Tiobon.Core.Model/Base/Ghrh/Ghrh_YearHumanSettings.Dto.Base.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/11/22 15:43:22  SimonHsiao   初版
+*V0.01  2024/12/11 13:43:39  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -24,10 +24,9 @@ public class Ghrh_YearHumanSettingsBase
 {
 
     /// <summary>
-    /// 年月
+    /// 年度
     /// </summary>
-    [Display(Name = "YearMonth"), Description("年月"), MaxLength(100, ErrorMessage = "年月 不能超过 100 个字符")]
+    public int? Year { get; set; }
-    public string YearMonth { get; set; }
 
     /// <summary>
     /// 部门ID
@@ -50,34 +49,124 @@ public class Ghrh_YearHumanSettingsBase
     public int? JobId { get; set; }
 
     /// <summary>
-    /// 预算内编制数
+    /// 1月
     /// </summary>
-    public int? BudgetInStaffCount { get; set; }
+    public int? M1 { get; set; }
 
     /// <summary>
-    /// 预算外编制数
+    /// 2月
     /// </summary>
-    public int? BudgetOutStaffCount { get; set; }
+    public int? M2 { get; set; }
 
     /// <summary>
-    /// 预算内在编人数
+    /// 3月
     /// </summary>
-    public int? BudgetInDutyStaffCount { get; set; }
+    public int? M3 { get; set; }
 
     /// <summary>
-    /// 预算外在编人数
+    /// 4月
     /// </summary>
-    public int? BudgetOutDutyStaffCount { get; set; }
+    public int? M4 { get; set; }
 
     /// <summary>
-    /// 预算内缺编人数
+    /// 5月
     /// </summary>
-    public int? BudgetInLackStaffCount { get; set; }
+    public int? M5 { get; set; }
 
     /// <summary>
-    /// 预算外缺编人数
+    /// 6月
     /// </summary>
-    public int? BudgetOutLackStaffCount { get; set; }
+    public int? M6 { get; set; }
+
+    /// <summary>
+    /// 7月
+    /// </summary>
+    public int? M7 { get; set; }
+
+    /// <summary>
+    /// 8月
+    /// </summary>
+    public int? M8 { get; set; }
+
+    /// <summary>
+    /// 9月
+    /// </summary>
+    public int? M9 { get; set; }
+
+    /// <summary>
+    /// 10月
+    /// </summary>
+    public int? M10 { get; set; }
+
+    /// <summary>
+    /// 11月
+    /// </summary>
+    public int? M11 { get; set; }
+
+    /// <summary>
+    /// 12月
+    /// </summary>
+    public int? M12 { get; set; }
+
+    /// <summary>
+    /// 1月调整数
+    /// </summary>
+    public int? M1_A { get; set; }
+
+    /// <summary>
+    /// 2月调整数
+    /// </summary>
+    public int? M2_A { get; set; }
+
+    /// <summary>
+    /// 3月调整数
+    /// </summary>
+    public int? M3_A { get; set; }
+
+    /// <summary>
+    /// 4月调整数
+    /// </summary>
+    public int? M4_A { get; set; }
+
+    /// <summary>
+    /// 5月调整数
+    /// </summary>
+    public int? M5_A { get; set; }
+
+    /// <summary>
+    /// 6月调整数
+    /// </summary>
+    public int? M6_A { get; set; }
+
+    /// <summary>
+    /// 7月调整数
+    /// </summary>
+    public int? M7_A { get; set; }
+
+    /// <summary>
+    /// 8月调整数
+    /// </summary>
+    public int? M8_A { get; set; }
+
+    /// <summary>
+    /// 9月调整数
+    /// </summary>
+    public int? M9_A { get; set; }
+
+    /// <summary>
+    /// 10月调整数
+    /// </summary>
+    public int? M10_A { get; set; }
+
+    /// <summary>
+    /// 11月调整数
+    /// </summary>
+    public int? M11_A { get; set; }
+
+    /// <summary>
+    /// 12月调整数
+    /// </summary>
+    public int? M12_A { get; set; }
 
     /// <summary>
     /// 发起人ID

Tiobon.Core.Model/Models/Ghrh/Ghrh_YearHumanSettings.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/11/22 15:43:22  SimonHsiao   初版
+*V0.01  2024/12/11 13:43:39  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -25,10 +25,9 @@ public class Ghrh_YearHumanSettings : BasePoco
 {
 
     /// <summary>
-    /// 年月
+    /// 年度
     /// </summary>
-    [Display(Name = "YearMonth"), Description("年月"), MaxLength(100, ErrorMessage = "年月 不能超过 100 个字符")]
+    public int? Year { get; set; }
-    public string YearMonth { get; set; }
 
     /// <summary>
     /// 部门ID
@@ -51,34 +50,124 @@ public class Ghrh_YearHumanSettings : BasePoco
     public int? JobId { get; set; }
 
     /// <summary>
-    /// 预算内编制数
+    /// 1月
     /// </summary>
-    public int? BudgetInStaffCount { get; set; }
+    public int? M1 { get; set; }
 
     /// <summary>
-    /// 预算外编制数
+    /// 2月
     /// </summary>
-    public int? BudgetOutStaffCount { get; set; }
+    public int? M2 { get; set; }
 
     /// <summary>
-    /// 预算内在编人数
+    /// 3月
     /// </summary>
-    public int? BudgetInDutyStaffCount { get; set; }
+    public int? M3 { get; set; }
 
     /// <summary>
-    /// 预算外在编人数
+    /// 4月
     /// </summary>
-    public int? BudgetOutDutyStaffCount { get; set; }
+    public int? M4 { get; set; }
 
     /// <summary>
-    /// 预算内缺编人数
+    /// 5月
     /// </summary>
-    public int? BudgetInLackStaffCount { get; set; }
+    public int? M5 { get; set; }
 
     /// <summary>
-    /// 预算外缺编人数
+    /// 6月
     /// </summary>
-    public int? BudgetOutLackStaffCount { get; set; }
+    public int? M6 { get; set; }
+
+    /// <summary>
+    /// 7月
+    /// </summary>
+    public int? M7 { get; set; }
+
+    /// <summary>
+    /// 8月
+    /// </summary>
+    public int? M8 { get; set; }
+
+    /// <summary>
+    /// 9月
+    /// </summary>
+    public int? M9 { get; set; }
+
+    /// <summary>
+    /// 10月
+    /// </summary>
+    public int? M10 { get; set; }
+
+    /// <summary>
+    /// 11月
+    /// </summary>
+    public int? M11 { get; set; }
+
+    /// <summary>
+    /// 12月
+    /// </summary>
+    public int? M12 { get; set; }
+
+    /// <summary>
+    /// 1月调整数
+    /// </summary>
+    public int? M1_A { get; set; }
+
+    /// <summary>
+    /// 2月调整数
+    /// </summary>
+    public int? M2_A { get; set; }
+
+    /// <summary>
+    /// 3月调整数
+    /// </summary>
+    public int? M3_A { get; set; }
+
+    /// <summary>
+    /// 4月调整数
+    /// </summary>
+    public int? M4_A { get; set; }
+
+    /// <summary>
+    /// 5月调整数
+    /// </summary>
+    public int? M5_A { get; set; }
+
+    /// <summary>
+    /// 6月调整数
+    /// </summary>
+    public int? M6_A { get; set; }
+
+    /// <summary>
+    /// 7月调整数
+    /// </summary>
+    public int? M7_A { get; set; }
+
+    /// <summary>
+    /// 8月调整数
+    /// </summary>
+    public int? M8_A { get; set; }
+
+    /// <summary>
+    /// 9月调整数
+    /// </summary>
+    public int? M9_A { get; set; }
+
+    /// <summary>
+    /// 10月调整数
+    /// </summary>
+    public int? M10_A { get; set; }
+
+    /// <summary>
+    /// 11月调整数
+    /// </summary>
+    public int? M11_A { get; set; }
+
+    /// <summary>
+    /// 12月调整数
+    /// </summary>
+    public int? M12_A { get; set; }
 
     /// <summary>
     /// 发起人ID

Tiobon.Core.Model/ServiceResult.cs

@@ -220,6 +220,9 @@ public class DT_TableDataT<T>
     public List<T> DT_TableDataT1 { get; set; } = new List<T>();
 
     public DT_TablePageInfoT DT_TablePageInfoT1 { get; set; } = new DT_TablePageInfoT();
+
+    public JM_TableColumnT1 JM_TableColumnT1 { get; set; } = new JM_TableColumnT1();
+
 }
 public class DT_TablePageInfoT
 {

Tiobon.Core.Model/ViewModels/Menu.cs

@@ -122,6 +122,7 @@ public class TableColumn
     public string AppColumnType { get; set; }
     public int pageColumnID { get; set; }
     public int IsRange { get; set; } = 0;
+    public string GroupName { get; set; }
 }
 public class searchOperator
 {

Tiobon.Core.Services/CommonServices.cs

@@ -1753,6 +1753,79 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 });
                 break;
             case "F_OfferTemplate":
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
+                if (toolbar != null) toolbar.fnKey = "TBD1YN";
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault();
+                if (toolbar != null) toolbar.fnKey = "TBD2YN";
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "DetailYN").FirstOrDefault();
+                if (toolbar != null) toolbar.fnKey = "TBD3YN";
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault();
+                if (toolbar != null) toolbar.fnKey = "TBD4YN";
+                break;
+            case "F_AnnualManpower":
+
+                var config = await Db.Queryable<Ghrh_Config>().Where(x => x.ConfigCode == "ESS_Recruit_Year_Human_Start_Month").FirstAsync();
+                var startMonth = config != null ? config.ConfigValue.ObjToInt() : 1;
+                var months = new List<string>();
+                List<int> numbers = new();
+                for (int i = 1; i <= 12; i++)
+                {
+                    if (i < 10)
+                        months.Add("0" + i);
+                    else
+                        months.Add(i.ObjToString());
+                    numbers.Add(i);
+                }
+                var curentYear = DateTime.Now.Year;
+                var curentMonth = DateTime.Now.Month;
+                // 指定要打头的数字
+                int startNumber = startMonth;
+
+
+                if (curentMonth < startMonth)
+                    curentYear = -1;
+                // 创建一个新的列表用于存储重新排序后的结果
+                List<int> reorderedNumbers = new();
+
+                var sort = result.JM_TableColumnT1.TableColumn.Where(x => x.field == "M1").SingleOrDefault()?.SortNo ?? 5;
+
+                result.JM_TableColumnT1.TableColumn?.ForEach(x =>
+                {
+                    if (months.Where(o => o == x.label).Any())
+                        x.GroupName = "预算编制数";
+
+                    if (x.field == "Year")
+                        x.searchColumnDefaultValue = curentYear;
+                });
+
+                // 找到指定数字的索引
+                int index1 = numbers.IndexOf(startNumber);
+                if (index1 != -1)
+                {
+                    // 从指定数字开始，按照循环顺序添加数字
+                    for (int i = 0; i < numbers.Count; i++)
+                    {
+                        int currentIndex = (index1 + i) % numbers.Count;
+                        reorderedNumbers.Add(numbers[currentIndex]);
+                    }
+
+                    foreach (var num in reorderedNumbers)
+                    {
+                        result.JM_TableColumnT1.TableColumn?.ForEach(x =>
+                        {
+                            if (x.label.ObjToInt() == num)
+                            {
+                                x.SortNo = sort;
+                                x.label = curentYear + "-" + x.label;
+                            }
+                        });
+                        if (num == 12)
+                            curentYear++;
+                        sort++;
+                    }
+                }
+                result.JM_TableColumnT1.TableColumn = result.JM_TableColumnT1.TableColumn.OrderBy(x => x.SortNo).ToList();
+
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
                 if (toolbar != null) toolbar.fnKey = "TBD1YN";
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault();

Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs

@@ -1,4 +1,7 @@
-namespace Tiobon.Core.Services;
+using Elasticsearch.Net;
+using NPOI.Util.Collections;
+
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 年度人力配置 (服务)
@@ -6,17 +9,33 @@
 public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSettings, Ghrh_YearHumanSettingsDto, InsertGhrh_YearHumanSettingsInput, EditGhrh_YearHumanSettingsInput>, IGhrh_YearHumanSettingsServices
 {
     private readonly IBaseRepository<Ghrh_YearHumanSettings> _dal;
-    public Ghrh_YearHumanSettingsServices(ICaching caching, IBaseRepository<Ghrh_YearHumanSettings> dal)
+    private readonly ICommonServices _commonServices;
+    public Ghrh_YearHumanSettingsServices(ICaching caching, IBaseRepository<Ghrh_YearHumanSettings> dal, ICommonServices commonServices)
     {
         this._dal = dal;
         base.BaseDal = dal;
         base._caching = caching;
+        _commonServices = commonServices;
     }
 
     public override async Task<ServicePageResult<Ghrh_YearHumanSettingsDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
     {
         var result = await base.QueryFilterPage(filter, condition, IsEnable);
         var entitys = result.result.DT_TableDataT1;
+        int? year = null;
+        if (filter.jsonParam != null)
+            foreach (JProperty jProperty in filter.jsonParam.Properties())
+            {
+                var name = jProperty.Name;
+                var value = jProperty.Value.ToString();
+                if (name == "Year")
+                {
+
+                    var jsonParam = JsonHelper.JsonToObj<JsonParam>(value);
+                    year = jsonParam.columnValue.ObjToInt();
+
+                }
+            }
 
         var deptIds = entitys.Where(x => x.DeptId != null).Select(x => x.DeptId).ToList();
         var titleIds = entitys.Where(x => x.TitleId != null).Select(x => x.TitleId).ToList();
@@ -64,6 +83,27 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
         }
 
         result.result.DT_TableDataT1 = entitys;
+        ModuleParam param = new ModuleParam()
+        {
+            langId = filter.langId,
+            menuName = filter.menuName
+        };
+        var module = await _commonServices.GetModuleInfoAsync(param);
+        result.result.JM_TableColumnT1 = module.Data.JM_TableColumnT1;
+
+        var yearField = module.Data.JM_TableColumnT1.TableColumn.Where(x => x.field == "Year").SingleOrDefault();
+        if (year != yearField?.searchColumnDefaultValue.ObjToInt())
+        {
+
+            result.result.JM_TableColumnT1.TableColumn?.ForEach(x =>
+            {
+                int month = x.field.Replace("M", null).ObjToInt();
+                if (x.GroupName == "预算编制数")
+                    x.label = year + "-" + x.field.Replace("M", null);
+                if (month == 12)
+                    year++;
+            });
+        }
         return result;
     }
 }

Tiobon.Core/Tiobon.Core.xml

@@ -736,6 +736,16 @@
             厂区(Controller)
             </summary>
         </member>
+        <member name="T:Tiobon.Core.Api.Controllers.Ghrc_PeriodMasterController">
+            <summary>
+            Ghrc_PeriodMaster(Controller)
+            </summary>
+        </member>
+        <member name="T:Tiobon.Core.Api.Controllers.Ghrc_SalaryItemController">
+            <summary>
+            Ghrc_SalaryItem(Controller)
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghre_AttachmentController">
             <summary>
             附件(Controller)
@@ -1775,6 +1785,11 @@
             系统用户(Controller)
             </summary>
         </member>
+        <member name="T:Tiobon.Core.Api.Controllers.Ghrz_Shihua_OA_EmploymentController">
+            <summary>
+            Ghrz_Shihua_OA_Employment(Controller)
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Systems.CacheManageController">
             <summary>
             缓存管理