From c441d2dad544fa02252d27332f0fb66a1c6c0c04 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Thu, 9 Jan 2025 09:33:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ghrh/Ghrh_ResumeServices.cs | 89 ++++++++++--------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 32a1c1d9..57679eca 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -3822,7 +3822,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 var currencyId = await Db.Ado.GetIntAsync("SELECT top 1 CurrencyID FROM Ghrc_Currency where CurrencyNo='RMB'"); if (data.S02.IsNotEmptyOrNull()) - if (data.S02 > 0) + if (data.S02 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S02").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -3837,7 +3837,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 } if (data.S03.IsNotEmptyOrNull()) - if (data.S03 > 0) + if (data.S03 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S03").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -3851,7 +3851,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 }); } if (data.S04.IsNotEmptyOrNull()) - if (data.S04 > 0) + if (data.S04 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S04").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -3879,7 +3879,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 }); } if (data.S06.IsNotEmptyOrNull()) - if (data.S06 > 0) + if (data.S06 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S06").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -3893,7 +3893,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 }); } if (data.S21.IsNotEmptyOrNull()) - if (data.S21 > 0) + if (data.S21 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S21").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -3907,7 +3907,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 }); } if (data.S22.IsNotEmptyOrNull()) - if (data.S22 > 0) + if (data.S22 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S22").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -3921,7 +3921,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 }); } if (data.S23.IsNotEmptyOrNull()) - if (data.S23 > 0) + if (data.S23 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S23").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -3935,7 +3935,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 }); } if (data.S66.IsNotEmptyOrNull()) - if (data.S66 > 0) + if (data.S66 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S66").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -3949,7 +3949,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 }); } if (data.S68.IsNotEmptyOrNull()) - if (data.S68 > 0) + if (data.S68 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S68").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -3963,7 +3963,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 }); } if (data.S70.IsNotEmptyOrNull()) - if (data.S70 > 0) + if (data.S70 != 0) { var salaryItemId = (await Db.Queryable().Where(x => x.SalaryItemNo == "S70").FirstAsync())?.SalaryItemID; items.Add(new Ghrh_OfferApplyOrderSalary() @@ -4757,7 +4757,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 #endregion - #region 录用名单 + #region 录用名单导出 public async Task> ExportHireExcel(QueryExport body) { @@ -5226,18 +5226,19 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 #endregion #region 薪资项目同步 - if (inTime != null) - { - var salaryConfig = await Db.Queryable().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Check_In_Apply_Salary").FirstAsync(); - var TempOrOfficial = salaryConfig?.ConfigValue ?? "Temp"; + if (applyOrder != null && inTime != null && applyOrder.ProbationSalary != null) + if (applyOrder.ProbationSalary > 0) + { + var salaryConfig = await Db.Queryable().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Check_In_Apply_Salary").FirstAsync(); + var TempOrOfficial = salaryConfig?.ConfigValue ?? "Temp"; - var IsEnable = 2; + var IsEnable = 2; - sql = $"SELECT SalaryChangeID FROM Ghrc_SalaryChange WHERE IsEnable>=1 and StaffID='{staffId}' and ChangeDate = '{inTime.Value.Date}'"; - var SalaryChangeID = await Db.Ado.SqlQueryAsync(sql); - if (SalaryChangeID.Any()) - { - var sql1 = @$"UPDATE Ghrc_SalaryChange + sql = $"SELECT SalaryChangeID FROM Ghrc_SalaryChange WHERE IsEnable>=1 and StaffID='{staffId}' and ChangeDate = '{inTime.Value.Date}'"; + var SalaryChangeID = await Db.Ado.SqlQueryAsync(sql); + if (SalaryChangeID.Any()) + { + var sql1 = @$"UPDATE Ghrc_SalaryChange SET IsEnable = 0, UpdateBy = {App.User.ID}, UpdateTime = GETDATE (), @@ -5250,10 +5251,10 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 UpdateTime = GETDATE (), UpdateProg = 'SyncToStaff' WHERE SalaryChangeID = {SalaryChangeID[0]} AND IsEnable >= 1;"; - await Db.Ado.ExecuteCommandAsync(sql1); - } + await Db.Ado.ExecuteCommandAsync(sql1); + } - sql = @$"open symmetric key GHR50AesKey decryption by certificate TiobonGHRCer; + sql = @$"open symmetric key GHR50AesKey decryption by certificate TiobonGHRCer; INSERT INTO [dbo].[Ghrc_SalaryChange] ( StaffID,WorkNo, ChangeDate, @@ -5275,9 +5276,9 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 Declare @N_SCID int = SCOPE_IDENTITY() select @N_SCID"; - var @N_SCID = await Db.Ado.GetIntAsync(sql); + var @N_SCID = await Db.Ado.GetIntAsync(sql); - sql = @"UPDATE A + sql = @"UPDATE A SET A.Reverse1 = b.SalaryItemNo, A.UpdateTime = getdate (), A.UpdateProg = 'SyncToStaff' @@ -5285,23 +5286,23 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 JOIN Ghrc_SalaryItem b ON A.SalaryItemId = b.SalaryItemID WHERE A.Reverse1 IS NULL"; - await Db.Ado.ExecuteCommandAsync(sql); + await Db.Ado.ExecuteCommandAsync(sql); + + var items = await Db.Queryable().Where(x => x.OrderId == applyOrder.Id).ToListAsync(); + + var S02 = items.Where(x => x.Reverse1 == "S02").FirstOrDefault()?.Amount ?? 0; + var S03 = items.Where(x => x.Reverse1 == "S03").FirstOrDefault()?.Amount ?? 0; + var S04 = items.Where(x => x.Reverse1 == "S04").FirstOrDefault()?.Amount ?? 0; + var S05 = items.Where(x => x.Reverse1 == "S05").FirstOrDefault()?.Amount ?? 0; + var S06 = items.Where(x => x.Reverse1 == "S06").FirstOrDefault()?.Amount ?? 0; + var S21 = items.Where(x => x.Reverse1 == "S21").FirstOrDefault()?.Amount ?? 0; + var S22 = items.Where(x => x.Reverse1 == "S22").FirstOrDefault()?.Amount ?? 0; + var S23 = items.Where(x => x.Reverse1 == "S23").FirstOrDefault()?.Amount ?? 0; + var S66 = items.Where(x => x.Reverse1 == "S66").FirstOrDefault()?.Amount ?? 0; + var S68 = items.Where(x => x.Reverse1 == "S68").FirstOrDefault()?.Amount ?? 0; + var S70 = items.Where(x => x.Reverse1 == "S70").FirstOrDefault()?.Amount ?? 0; - var items = await Db.Queryable().Where(x => x.OrderId == applyOrder.Id).ToListAsync(); - - var S02 = items.Where(x => x.Reverse1 == "S02").FirstOrDefault()?.Amount ?? 0; - var S03 = items.Where(x => x.Reverse1 == "S03").FirstOrDefault()?.Amount ?? 0; - var S04 = items.Where(x => x.Reverse1 == "S04").FirstOrDefault()?.Amount ?? 0; - var S05 = items.Where(x => x.Reverse1 == "S05").FirstOrDefault()?.Amount ?? 0; - var S06 = items.Where(x => x.Reverse1 == "S06").FirstOrDefault()?.Amount ?? 0; - var S21 = items.Where(x => x.Reverse1 == "S21").FirstOrDefault()?.Amount ?? 0; - var S22 = items.Where(x => x.Reverse1 == "S22").FirstOrDefault()?.Amount ?? 0; - var S23 = items.Where(x => x.Reverse1 == "S23").FirstOrDefault()?.Amount ?? 0; - var S66 = items.Where(x => x.Reverse1 == "S66").FirstOrDefault()?.Amount ?? 0; - var S68 = items.Where(x => x.Reverse1 == "S68").FirstOrDefault()?.Amount ?? 0; - var S70 = items.Where(x => x.Reverse1 == "S70").FirstOrDefault()?.Amount ?? 0; - - sql = @$"open symmetric key GHR50AesKey decryption by certificate TiobonGHRCer; + sql = @$"open symmetric key GHR50AesKey decryption by certificate TiobonGHRCer; Declare @Regular_SalaryDetail table (SalaryItemNo nvarchar(100), Amount Decimal(18,2)) insert into @Regular_SalaryDetail select 'S02',{S02} @@ -5323,8 +5324,8 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 from @Regular_SalaryDetail a inner join Ghrc_SalaryItem b on a.SalaryItemNo = b.SalaryItemNo where b.IsEnable = 1 and ISNULL(a.Amount,0) > 0"; - await Db.Ado.ExecuteCommandAsync(sql); - } + await Db.Ado.ExecuteCommandAsync(sql); + } #endregion } await Db.Ado.CommitTranAsync();