diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index cd7e732e..200466ed 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -38326,11 +38326,11 @@ Ghra_staff_InsureBase 7EFA7C02-2280-4398-8562-E579EF6A9EBF -职称ID +岗位ID TitleId 1730425516 Administrator -1730430578 +1730432549 Administrator 职称ID int @@ -38348,11 +38348,11 @@ Ghra_staff_InsureBase 95627382-B61B-4C56-9EF7-6F65D023C9C8 -岗位ID +职称ID JobId 1730425516 Administrator -1730430582 +1730432565 Administrator 岗位ID int diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_YearHumanSettings.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_YearHumanSettings.Dto.Base.cs index ff58b0c3..07daf874 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_YearHumanSettings.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_YearHumanSettings.Dto.Base.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/11/1 10:15:24 SimonHsiao 初版 +*V0.01 2024/11/1 11:10:38 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -35,26 +35,22 @@ namespace Tiobon.Core.Model.Models /// /// 部门ID /// - [Display(Name = "DeptId"), Description("部门ID"), MaxLength(100, ErrorMessage = "部门ID 不能超过 100 个字符")] - public string DeptId { get; set; } + public int? DeptId { get; set; } /// /// 职称ID /// - [Display(Name = "TitleId"), Description("职称ID"), MaxLength(2000, ErrorMessage = "职称ID 不能超过 2000 个字符")] - public string TitleId { get; set; } + public int? TitleId { get; set; } /// /// 职等ID /// - [Display(Name = "GradeId"), Description("职等ID"), MaxLength(2000, ErrorMessage = "职等ID 不能超过 2000 个字符")] - public string GradeId { get; set; } + public int? GradeId { get; set; } /// /// 岗位ID /// - [Display(Name = "JobId"), Description("岗位ID"), MaxLength(2000, ErrorMessage = "岗位ID 不能超过 2000 个字符")] - public string JobId { get; set; } + public int? JobId { get; set; } /// /// 预算内编制数 diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_YearHumanSettings.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_YearHumanSettings.Dto.EditInput.cs index 82d8b555..5646114a 100644 --- a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_YearHumanSettings.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_YearHumanSettings.Dto.EditInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/11/1 10:15:24 SimonHsiao 初版 +*V0.01 2024/11/1 11:10:38 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_YearHumanSettings.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_YearHumanSettings.Dto.InsertInput.cs index 414385e7..6a8f0853 100644 --- a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_YearHumanSettings.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_YearHumanSettings.Dto.InsertInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/11/1 10:15:24 SimonHsiao 初版 +*V0.01 2024/11/1 11:10:38 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_YearHumanSettings.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_YearHumanSettings.cs index 0fe69e63..34f69dec 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_YearHumanSettings.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_YearHumanSettings.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/11/1 10:15:24 SimonHsiao 初版 +*V0.01 2024/11/1 11:10:38 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -37,26 +37,22 @@ namespace Tiobon.Core.Model.Models /// /// 部门ID /// - [Display(Name = "DeptId"), Description("部门ID"), MaxLength(100, ErrorMessage = "部门ID 不能超过 100 个字符")] - public string DeptId { get; set; } + public int? DeptId { get; set; } /// /// 职称ID /// - [Display(Name = "TitleId"), Description("职称ID"), MaxLength(2000, ErrorMessage = "职称ID 不能超过 2000 个字符")] - public string TitleId { get; set; } + public int? TitleId { get; set; } /// /// 职等ID /// - [Display(Name = "GradeId"), Description("职等ID"), MaxLength(2000, ErrorMessage = "职等ID 不能超过 2000 个字符")] - public string GradeId { get; set; } + public int? GradeId { get; set; } /// /// 岗位ID /// - [Display(Name = "JobId"), Description("岗位ID"), MaxLength(2000, ErrorMessage = "岗位ID 不能超过 2000 个字符")] - public string JobId { get; set; } + public int? JobId { get; set; } /// /// 预算内编制数 diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_HumanRequest.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_HumanRequest.Dto.View.cs index 1916c6d0..ba874a80 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_HumanRequest.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_HumanRequest.Dto.View.cs @@ -13,7 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,18 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_HumanRequestDto : Ghrh_HumanRequest { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } + + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + + public string ApplyDeptName { get; set; } + public string BelongDeptName { get; set; } + public string GradeName { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_YearHumanSettings.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_YearHumanSettings.Dto.View.cs index c4a043a2..e1f0259f 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_YearHumanSettings.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_YearHumanSettings.Dto.View.cs @@ -6,14 +6,14 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/11/1 10:15:24 SimonHsiao 初版 +*V0.01 2024/11/1 11:10:38 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,20 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_YearHumanSettingsDto : Ghrh_YearHumanSettings { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + + + public string DeptName { get; set; } + public string TitleName { get; set; } + public string GradeName { get; set; } + + public string JobName { get; set; } } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs index c106c70a..7e63a658 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs @@ -4,6 +4,8 @@ using Tiobon.Core.Model.Models; using Tiobon.Core.Services.BASE; using Tiobon.Core.IRepository.Base; using Tiobon.Core.Common.Caches; +using Tiobon.Core.Common; +using Tiobon.Core.Model; namespace Tiobon.Core.Services { @@ -19,5 +21,59 @@ namespace Tiobon.Core.Services base.BaseDal = dal; base._caching = caching; } + public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) + { + var result = await base.QueryFilterPage(filter, condition, IsEnable); + var entitys = result.result.DT_TableDataT1; + + var deptIds = entitys.Where(x => x.ApplyDeptId != null).Select(x => x.ApplyDeptId).ToList(); + //var titleIds = entitys.Where(x => x.TitleId != null).Select(x => x.TitleId).ToList(); + 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(); + deptIds.AddRange(entitys.Where(x => x.BelongDeptId != null).Select(x => x.BelongDeptId).ToList()); + if (deptIds.Any()) + { + var depts = await Db.Queryable().Where(x => deptIds.Contains(x.DeptID)).ToListAsync(); + + entitys.ForEach(rule => + { + rule.ApplyDeptName = depts.FirstOrDefault(o => rule.ApplyDeptId == o.DeptID)?.DeptName; + rule.BelongDeptName = depts.FirstOrDefault(o => rule.BelongDeptId == o.DeptID)?.DeptName; + }); + } + + //if (titleIds.Any()) + //{ + // var titles = await Db.Queryable().Where(x => titleIds.Contains(x.TitleID)).ToListAsync(); + + // entitys.ForEach(rule => + // { + // rule.TitleName = titles.FirstOrDefault(o => rule.TitleId == o.TitleID)?.TitleName; + // }); + //} + + //if (gradeIds.Any()) + //{ + // var grades = await Db.Queryable().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync(); + + // entitys.ForEach(rule => + // { + // rule.GradeName = grades.FirstOrDefault(o => rule.GradeId == o.GradeID)?.GradeName; + // }); + //} + + //if (jobIds.Any()) + //{ + // var jobs = await Db.Queryable().Where(x => jobIds.Contains(x.JobID)).ToListAsync(); + + // entitys.ForEach(rule => + // { + // rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName; + // }); + //} + + result.result.DT_TableDataT1 = entitys; + return result; + } } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs index 295640cf..94985f41 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs @@ -4,12 +4,14 @@ using Tiobon.Core.Model.Models; using Tiobon.Core.Services.BASE; using Tiobon.Core.IRepository.Base; using Tiobon.Core.Common.Caches; +using Tiobon.Core.Common; +using Tiobon.Core.Model; namespace Tiobon.Core.Services { - /// - /// 年度人力配置 (服务) - /// + /// + /// 年度人力配置 (服务) + /// public class Ghrh_YearHumanSettingsServices : BaseServices, IGhrh_YearHumanSettingsServices { private readonly IBaseRepository _dal; @@ -19,5 +21,59 @@ namespace Tiobon.Core.Services base.BaseDal = dal; base._caching = caching; } + + public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) + { + var result = await base.QueryFilterPage(filter, condition, IsEnable); + var entitys = result.result.DT_TableDataT1; + + 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(); + 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(); + + if (deptIds.Any()) + { + var depts = await Db.Queryable().Where(x => deptIds.Contains(x.DeptID)).ToListAsync(); + + entitys.ForEach(rule => + { + rule.DeptName = depts.FirstOrDefault(o => rule.DeptId == o.DeptID)?.DeptName; + }); + } + + if (titleIds.Any()) + { + var titles = await Db.Queryable().Where(x => titleIds.Contains(x.TitleID)).ToListAsync(); + + entitys.ForEach(rule => + { + rule.TitleName = titles.FirstOrDefault(o => rule.TitleId == o.TitleID)?.TitleName; + }); + } + + if (gradeIds.Any()) + { + var grades = await Db.Queryable().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync(); + + entitys.ForEach(rule => + { + rule.GradeName = grades.FirstOrDefault(o => rule.GradeId == o.GradeID)?.GradeName; + }); + } + + if (jobIds.Any()) + { + var jobs = await Db.Queryable().Where(x => jobIds.Contains(x.JobID)).ToListAsync(); + + entitys.ForEach(rule => + { + rule.JobName = jobs.FirstOrDefault(o => rule.JobId == o.JobID)?.JobName; + }); + } + + result.result.DT_TableDataT1 = entitys; + return result; + } } } \ No newline at end of file