diff --git a/Tiobon.Core.Api/Controllers/Ghrc/Ghrc_SalaryItemController.cs b/Tiobon.Core.Api/Controllers/Ghrc/Ghrc_SalaryItemController.cs new file mode 100644 index 00000000..2a3f2867 --- /dev/null +++ b/Tiobon.Core.Api/Controllers/Ghrc/Ghrc_SalaryItemController.cs @@ -0,0 +1,14 @@ +namespace Tiobon.Core.Api.Controllers; + +/// +/// Ghrc_SalaryItem(Controller) +/// +[Route("api/[controller]")] +[ApiController, GlobalActionFilter] +[Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Ghrc)] +public class Ghrc_SalaryItemController : BaseController +{ + public Ghrc_SalaryItemController(IGhrc_SalaryItemServices service) : base(service) + { + } +} \ No newline at end of file diff --git a/Tiobon.Core.Extensions/ServiceExtensions/SwaggerSetup.cs b/Tiobon.Core.Extensions/ServiceExtensions/SwaggerSetup.cs index 2d0fd3c3..05d25704 100644 --- a/Tiobon.Core.Extensions/ServiceExtensions/SwaggerSetup.cs +++ b/Tiobon.Core.Extensions/ServiceExtensions/SwaggerSetup.cs @@ -313,7 +313,8 @@ namespace Tiobon.Core.Extensions /// 招聘模块 /// public const string GroupName_Ghrz = " other"; - + public const string GroupName_Ghrc = " other"; + } } diff --git a/Tiobon.Core.IServices/Ghrc/IGhrc_SalaryItemServices.cs b/Tiobon.Core.IServices/Ghrc/IGhrc_SalaryItemServices.cs new file mode 100644 index 00000000..77f24293 --- /dev/null +++ b/Tiobon.Core.IServices/Ghrc/IGhrc_SalaryItemServices.cs @@ -0,0 +1,11 @@ +using Tiobon.Core.IServices.BASE; +using Tiobon.Core.Model.Models; + +namespace Tiobon.Core.IServices; + +/// +/// Ghrc_SalaryItem(自定义服务接口) +/// + public interface IGhrc_SalaryItemServices :IBaseServices +{ + } \ No newline at end of file diff --git a/Tiobon.Core.Model/Base/Ghrc/Ghrc_SalaryItem.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrc/Ghrc_SalaryItem.Dto.Base.cs new file mode 100644 index 00000000..73bb0a32 --- /dev/null +++ b/Tiobon.Core.Model/Base/Ghrc/Ghrc_SalaryItem.Dto.Base.cs @@ -0,0 +1,186 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrc_SalaryItem.cs +* +*功 能： N / A +* 类 名： Ghrc_SalaryItem +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/12/10 15:41:05 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +namespace Tiobon.Core.Model.Models; + + +/// +/// Ghrc_SalaryItem (Dto.Base) +/// +public class Ghrc_SalaryItemBase +{ + + /// + /// SalaryItemID + /// + public int? SalaryItemID { get; set; } + + /// + /// DataBelongID + /// + public int? DataBelongID { get; set; } + + /// + /// SalaryItemNo + /// + [Display(Name = "SalaryItemNo"), Description("SalaryItemNo"), MaxLength(100, ErrorMessage = "SalaryItemNo 不能超过 100 个字符")] + public string SalaryItemNo { get; set; } + + /// + /// SalaryItemName + /// + [Display(Name = "SalaryItemName"), Description("SalaryItemName"), MaxLength(1000, ErrorMessage = "SalaryItemName 不能超过 1000 个字符")] + public string SalaryItemName { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(1000, ErrorMessage = "MKey 不能超过 1000 个字符")] + public string MKey { get; set; } + + /// + /// IsBuildIn + /// + public int? IsBuildIn { get; set; } + + /// + /// SumType + /// + [Display(Name = "SumType"), Description("SumType"), MaxLength(100, ErrorMessage = "SumType 不能超过 100 个字符")] + public string SumType { get; set; } + + /// + /// ItemType + /// + [Display(Name = "ItemType"), Description("ItemType"), MaxLength(100, ErrorMessage = "ItemType 不能超过 100 个字符")] + public string ItemType { get; set; } + + /// + /// IsTax + /// + public int? IsTax { get; set; } + + /// + /// IsPlus + /// + public int? IsPlus { get; set; } + + /// + /// IsOnlyTax + /// + public int? IsOnlyTax { get; set; } + + /// + /// IsOnlyBase + /// + public int? IsOnlyBase { get; set; } + + /// + /// GLAccount + /// + [Display(Name = "GLAccount"), Description("GLAccount"), MaxLength(1000, ErrorMessage = "GLAccount 不能超过 1000 个字符")] + public string GLAccount { get; set; } + + /// + /// IsSpecialDeduct + /// + public int? IsSpecialDeduct { get; set; } + + /// + /// SpecialDeductType + /// + [Display(Name = "SpecialDeductType"), Description("SpecialDeductType"), MaxLength(100, ErrorMessage = "SpecialDeductType 不能超过 100 个字符")] + public string SpecialDeductType { get; set; } + + /// + /// DecimalPointCount + /// + public int? DecimalPointCount { get; set; } + + /// + /// DecimalCalType + /// + [Display(Name = "DecimalCalType"), Description("DecimalCalType"), MaxLength(100, ErrorMessage = "DecimalCalType 不能超过 100 个字符")] + public string DecimalCalType { get; set; } + + /// + /// IsCalSalarySave + /// + public int? IsCalSalarySave { get; set; } + + /// + /// CalSalarySaveSeq + /// + public int? CalSalarySaveSeq { get; set; } + + /// + /// ItemFormulaText + /// + [Display(Name = "ItemFormulaText"), Description("ItemFormulaText"), MaxLength(-1, ErrorMessage = "ItemFormulaText 不能超过 -1 个字符")] + public string ItemFormulaText { get; set; } + + /// + /// ItemFormulaHtmlText + /// + [Display(Name = "ItemFormulaHtmlText"), Description("ItemFormulaHtmlText"), MaxLength(-1, ErrorMessage = "ItemFormulaHtmlText 不能超过 -1 个字符")] + public string ItemFormulaHtmlText { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } +} diff --git a/Tiobon.Core.Model/Edit/Ghrc/Ghrc_SalaryItem.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrc/Ghrc_SalaryItem.Dto.EditInput.cs new file mode 100644 index 00000000..80b05908 --- /dev/null +++ b/Tiobon.Core.Model/Edit/Ghrc/Ghrc_SalaryItem.Dto.EditInput.cs @@ -0,0 +1,26 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrc_SalaryItem.cs +* +*功 能： N / A +* 类 名： Ghrc_SalaryItem +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/12/10 15:41:05 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + + +/// +/// Ghrc_SalaryItem (Dto.EditInput) +/// +public class EditGhrc_SalaryItemInput : Ghrc_SalaryItemBase +{ +} diff --git a/Tiobon.Core.Model/Insert/Ghrc/Ghrc_SalaryItem.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrc/Ghrc_SalaryItem.Dto.InsertInput.cs new file mode 100644 index 00000000..6e68d24c --- /dev/null +++ b/Tiobon.Core.Model/Insert/Ghrc/Ghrc_SalaryItem.Dto.InsertInput.cs @@ -0,0 +1,26 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrc_SalaryItem.cs +* +*功 能： N / A +* 类 名： Ghrc_SalaryItem +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/12/10 15:41:05 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + + +/// +/// Ghrc_SalaryItem (Dto.InsertInput) +/// +public class InsertGhrc_SalaryItemInput : Ghrc_SalaryItemBase +{ +} diff --git a/Tiobon.Core.Model/Models/Ghrc/Ghrc_SalaryItem.cs b/Tiobon.Core.Model/Models/Ghrc/Ghrc_SalaryItem.cs new file mode 100644 index 00000000..5e64b6b1 --- /dev/null +++ b/Tiobon.Core.Model/Models/Ghrc/Ghrc_SalaryItem.cs @@ -0,0 +1,188 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrc_SalaryItem.cs +* +*功 能： N / A +* 类 名： Ghrc_SalaryItem +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/12/10 15:41:05 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +namespace Tiobon.Core.Model.Models; + + +/// +/// Ghrc_SalaryItem (Model) +/// +[SugarTable("Ghrc_SalaryItem", "Ghrc_SalaryItem"), Entity(TableCnName = "Ghrc_SalaryItem", TableName = "Ghrc_SalaryItem")] +public class Ghrc_SalaryItem : BasePoco1 +{ + + /// + /// SalaryItemID + /// + [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true), Display(Name = "表主键")] + public int? SalaryItemID { get; set; } + + /// + /// DataBelongID + /// + public int? DataBelongID { get; set; } + + /// + /// SalaryItemNo + /// + [Display(Name = "SalaryItemNo"), Description("SalaryItemNo"), MaxLength(100, ErrorMessage = "SalaryItemNo 不能超过 100 个字符")] + public string SalaryItemNo { get; set; } + + /// + /// SalaryItemName + /// + [Display(Name = "SalaryItemName"), Description("SalaryItemName"), MaxLength(1000, ErrorMessage = "SalaryItemName 不能超过 1000 个字符")] + public string SalaryItemName { get; set; } + + /// + /// MKey + /// + [Display(Name = "MKey"), Description("MKey"), MaxLength(1000, ErrorMessage = "MKey 不能超过 1000 个字符")] + public string MKey { get; set; } + + /// + /// IsBuildIn + /// + public int? IsBuildIn { get; set; } + + /// + /// SumType + /// + [Display(Name = "SumType"), Description("SumType"), MaxLength(100, ErrorMessage = "SumType 不能超过 100 个字符")] + public string SumType { get; set; } + + /// + /// ItemType + /// + [Display(Name = "ItemType"), Description("ItemType"), MaxLength(100, ErrorMessage = "ItemType 不能超过 100 个字符")] + public string ItemType { get; set; } + + /// + /// IsTax + /// + public int? IsTax { get; set; } + + /// + /// IsPlus + /// + public int? IsPlus { get; set; } + + /// + /// IsOnlyTax + /// + public int? IsOnlyTax { get; set; } + + /// + /// IsOnlyBase + /// + public int? IsOnlyBase { get; set; } + + /// + /// GLAccount + /// + [Display(Name = "GLAccount"), Description("GLAccount"), MaxLength(1000, ErrorMessage = "GLAccount 不能超过 1000 个字符")] + public string GLAccount { get; set; } + + /// + /// IsSpecialDeduct + /// + public int? IsSpecialDeduct { get; set; } + + /// + /// SpecialDeductType + /// + [Display(Name = "SpecialDeductType"), Description("SpecialDeductType"), MaxLength(100, ErrorMessage = "SpecialDeductType 不能超过 100 个字符")] + public string SpecialDeductType { get; set; } + + /// + /// DecimalPointCount + /// + public int? DecimalPointCount { get; set; } + + /// + /// DecimalCalType + /// + [Display(Name = "DecimalCalType"), Description("DecimalCalType"), MaxLength(100, ErrorMessage = "DecimalCalType 不能超过 100 个字符")] + public string DecimalCalType { get; set; } + + /// + /// IsCalSalarySave + /// + public int? IsCalSalarySave { get; set; } + + /// + /// CalSalarySaveSeq + /// + public int? CalSalarySaveSeq { get; set; } + + /// + /// ItemFormulaText + /// + [Display(Name = "ItemFormulaText"), Description("ItemFormulaText"), MaxLength(-1, ErrorMessage = "ItemFormulaText 不能超过 -1 个字符")] + public string ItemFormulaText { get; set; } + + /// + /// ItemFormulaHtmlText + /// + [Display(Name = "ItemFormulaHtmlText"), Description("ItemFormulaHtmlText"), MaxLength(-1, ErrorMessage = "ItemFormulaHtmlText 不能超过 -1 个字符")] + public string ItemFormulaHtmlText { get; set; } + + /// + /// RemarkSz + /// + [Display(Name = "RemarkSz"), Description("RemarkSz"), MaxLength(2000, ErrorMessage = "RemarkSz 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// SortNo + /// + public int? SortNo { get; set; } + + /// + /// IsDefault + /// + public int? IsDefault { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// Reverse3 + /// + [Display(Name = "Reverse3"), Description("Reverse3"), MaxLength(1000, ErrorMessage = "Reverse3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// Reverse4 + /// + [Display(Name = "Reverse4"), Description("Reverse4"), MaxLength(1000, ErrorMessage = "Reverse4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// Reverse5 + /// + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } +} diff --git a/Tiobon.Core.Model/View/Ghrc/Ghrc_SalaryItem.Dto.View.cs b/Tiobon.Core.Model/View/Ghrc/Ghrc_SalaryItem.Dto.View.cs new file mode 100644 index 00000000..bf3aee2b --- /dev/null +++ b/Tiobon.Core.Model/View/Ghrc/Ghrc_SalaryItem.Dto.View.cs @@ -0,0 +1,34 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrc_SalaryItem.cs +* +*功 能： N / A +* 类 名： Ghrc_SalaryItem +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/12/10 15:41:05 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + +/// +/// Ghrc_SalaryItem(Dto.View1) +/// +public class Ghrc_SalaryItemDto : Ghrc_SalaryItem +{ + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } + + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } +} diff --git a/Tiobon.Core.Services/Ghrc/Ghrc_SalaryItemServices.cs b/Tiobon.Core.Services/Ghrc/Ghrc_SalaryItemServices.cs new file mode 100644 index 00000000..705ff634 --- /dev/null +++ b/Tiobon.Core.Services/Ghrc/Ghrc_SalaryItemServices.cs @@ -0,0 +1,15 @@ +namespace Tiobon.Core.Services; + +/// +/// Ghrc_SalaryItem (服务) +/// +public class Ghrc_SalaryItemServices : BaseServices, IGhrc_SalaryItemServices +{ + private readonly IBaseRepository _dal; + public Ghrc_SalaryItemServices(ICaching caching, IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } +} \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 598db085..2ee5ec51 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -2,9 +2,7 @@ using DinkToPdf.Contracts; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -using NPOI.OpenXmlFormats.Wordprocessing; using System.IO.Compression; -using System.Threading.Channels; using static Tiobon.Core.Model.Consts; namespace Tiobon.Core.Services; @@ -3289,6 +3287,9 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status"; { var data = list[i]; + if (await Db.Queryable().AnyAsync(x => x.IdCardNo == data.IDCardNo)) + continue; + var deptId = (await Db.Queryable().Where(x => x.DeptNo == data.DeptNo).FirstAsync())?.DeptID; var titleId = (await Db.Queryable().Where(x => x.TitleNo == data.TitleNo).FirstAsync())?.TitleID; var gradeId = (await Db.Queryable().Where(x => x.GradeNo == data.GradeNo).FirstAsync())?.GradeID; @@ -3309,15 +3310,138 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 AND C.Status = A.Status"; GradeId = gradeId, WorkAddress = workAddress, ProbationSalary = data.TotalAmount, - PeriodMasterId = periodMasterId + PeriodMasterId = periodMasterId, }; - long id = Db.Insertable(insert).ExecuteReturnSnowflakeId(); + long id = await Db.Insertable(insert).ExecuteReturnSnowflakeIdAsync(); + + #region 处理薪资项目 + var currencyId = await Db.Ado.GetIntAsync("SELECT top 1 CurrencyID FROM Ghrc_Currency where CurrencyNo='RMB'"); if (data.S02.IsNotEmptyOrNull()) { - + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S02").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S02, + CurrencyId = currencyId + }); } + if (data.S03.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S03").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S03, + CurrencyId = currencyId + }); + } + if (data.S04.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S04").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S04, + CurrencyId = currencyId + }); + } + if (data.S05.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S05").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S05, + CurrencyId = currencyId + }); + } + if (data.S06.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S06").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S06, + CurrencyId = currencyId + }); + } + if (data.S21.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S21").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S21, + CurrencyId = currencyId + }); + } + if (data.S22.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S22").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S22, + CurrencyId = currencyId + }); + } + if (data.S23.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S23").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S23, + CurrencyId = currencyId + }); + } + if (data.S66.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S66").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S66, + CurrencyId = currencyId + }); + } + if (data.S68.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S68").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S68, + CurrencyId = currencyId + }); + } + if (data.S70.IsNotEmptyOrNull()) + { + var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S70").FirstAsync())?.SalaryItemID; + items.Add(new Ghrh_OfferApplyOrderSalary() + { + OrderId = id, + SalaryItemId = salaryItemId, + Amount = data.S70, + CurrencyId = currencyId + }); + } + #endregion + if (items.Any()) + await Db.Insertable(items).ExecuteReturnSnowflakeIdAsync(); } } #endregion diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Shihua_OA_Sync_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Shihua_OA_Sync_Quartz.cs index fdf1e621..32f32aab 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Shihua_OA_Sync_Quartz.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Shihua_OA_Sync_Quartz.cs @@ -8,12 +8,12 @@ namespace Tiobon.Core.Tasks; public class Job_Shihua_OA_Sync_Quartz : JobBase, IJob { - private readonly IGhre_StudyRecordServices _ghre_StudyRecordServices; + private readonly IGhrh_ResumeServices _ghrh_ResumeServices; - public Job_Shihua_OA_Sync_Quartz(IGhre_StudyRecordServices ghre_StudyRecordServices, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) + public Job_Shihua_OA_Sync_Quartz(IGhrh_ResumeServices ghrh_ResumeServices, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices) : base(tasksQzServices, tasksLogServices) { - _ghre_StudyRecordServices = ghre_StudyRecordServices; + _ghrh_ResumeServices = ghrh_ResumeServices; } public async Task Execute(IJobExecutionContext context) { @@ -22,6 +22,6 @@ public class Job_Shihua_OA_Sync_Quartz : JobBase, IJob public async Task Run(IJobExecutionContext context) { Console.WriteLine($"Job_Shihua_OA_Sync_Quartz 执行 {DateTime.Now.ToShortTimeString()}"); - await _ghre_StudyRecordServices.SyncToESS(); + await _ghrh_ResumeServices.Shihua_OA_Sync(); } }