diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index 0030e53d..863536b0 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -4027,7 +4027,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
await _ghrh_InterviewRecordServices.Update(records, ["Status", "UpdateTime", "UpdateBy"]);
}
///
- /// 同步数据进入认识资料
+ /// 同步数据进人事资料
///
///
///
@@ -4061,6 +4061,8 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
dict.Add(x.MapColumnName, entity.GetPropertyValue(x.ColumnName));
});
+ dict.Add("CreateBy", App.User.ID);
+ dict.Add("CreateTime", DateTime.Now);
dict.Add("IsRelease", 1);
dict.Add("SortNo", 1);
dict.Add("IsDefault", 1);
@@ -4102,15 +4104,28 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
dict.Add("OvertimeRuleID", null);
dict.Add("TaxID", null);
- if(type != "Fast")
- {
-
- }
if (dict.Count > 0)
staffId = await Db.Insertable(dict).AS("Ghra_Staff").ExecuteReturnIdentityAsync();
if (staffId > 0)
{
+ string sql = $"update Ghra_Staff set Indate={inTime} where StaffID={staffId} and Indate is null";
+ if (inTime != null)
+ await Db.Ado.ExecuteCommandAsync(sql);
+ if (type != "Fast")
+ {
+ sql = $"update Ghra_Staff set StaffNo=[dbo].[FA_AutoStaffNo](StaffID) where StaffID={staffId} and StaffNo is null";
+ await Db.Ado.ExecuteCommandAsync(sql);
+
+ sql = @$"DECLARE @return_value int;
+
+ EXEC @return_value = GHR30.dbo.[PA_NewStaff]
+ @StaffID = {staffId};
+
+ SELECT @return_value as N'@Return Value';";
+ await Db.Ado.ExecuteCommandAsync(sql);
+ }
+
entity.IsSyncToStaff = true;
entity.StaffId = staffId;
await Update(entity, ["IsSyncToStaff", "StaffId"]);
@@ -4383,7 +4398,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
var IsEnable = 2;
- var sql = $"SELECT SalaryChangeID FROM Ghrc_SalaryChange WHERE IsEnable>=1 and StaffID='{staffId}' and ChangeDate = '{inTime.Value.Date}'";
+ 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())
{