diff --git a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs index 94c2a67c..abcea907 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs @@ -334,7 +334,10 @@ FROM Ghre_Request A string sql = @"SELECT *, TrainStaffId TrainStaffId1 FROM [120.26.205.42].[GhrUshio].[dbo].Ghrz_Ushio_TrainRequestApply_GHR50_V - WHERE RequestNo NOT IN (SELECT RequestNo FROM Ghre_Request)"; + WHERE RequestNo NOT IN (SELECT RequestNo + FROM Ghre_Request + WHERE IsEnable = 1) + AND EnableYN = 'Y'"; var dt = await Db.Ado.GetDataTableAsync(sql); @@ -378,6 +381,30 @@ FROM Ghre_Request A await base.Add(insert); } + + Log.Information($"【牛尾培训需求同步】查询到待同步{list.Count}条作废数据"); + sql = @"SELECT *, TrainStaffId TrainStaffId1 + FROM [120.26.205.42].[GhrUshio].[dbo].Ghrz_Ushio_TrainRequestApply_GHR50_V + WHERE RequestNo IN (SELECT RequestNo + FROM Ghre_Request + WHERE IsEnable = 1) + AND EnableYN = 'N'"; + + dt = await Db.Ado.GetDataTableAsync(sql); + + list = Db.Utilities.DataTableToList(dt); + + Log.Information($"【牛尾培训需求同步】查询到待同步{list.Count}条数据"); + for (int i = 0; i < list.Count; i++) + { + Log.Information($"【牛尾培训需求同步】同步队列{i + 1}/{list.Count}"); + + await Db.Updateable() + .SetColumns(it => new Ghre_Request() { IsEnable = 0 }) + .Where(it => it.RequestNo == list[i].RequestNo) + .ExecuteCommandAsync(); + } + } catch (Exception E) { diff --git a/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs index d1f3c7bd..4b3c837d 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs @@ -629,7 +629,7 @@ FROM (SELECT A.*, LEFT JOIN Ghra_Staff D ON A.ApplyStaffNo = D.StaffNo WHERE WorkNo NOT IN (SELECT WorkNo FROM Ghre_Teacher - WHERE WorkNo IS NOT NULL AND IsEnable=1)"; + WHERE WorkNo IS NOT NULL AND IsEnable=1) AND EnableYN = 'Y'"; var dt = await Db.Ado.GetDataTableAsync(sql); @@ -734,6 +734,45 @@ FROM (SELECT A.*, #endregion } + + sql = @"SELECT A.SchoolId, + b.DeptID, + C.StaffId, + A.TeacherType, + A.TeacherNo, + A.TeacherName, + A.PhotoUrl, + A.Gender, + A.Email, + A.Mobile, + A.TeacherLevel, + A.Price, + A.SkillPoints, + A.ApplyReason, + C.StaffId SponsorId,A.WorkNo,A.WorkID + FROM [120.26.205.42].[GhrUshio].[dbo].Ushio_TrainTeacher A + LEFT JOIN Ghro_Dept B ON A.DeptNo = B.DeptNo + LEFT JOIN Ghra_Staff C ON A.TeacherNo = C.StaffNo + LEFT JOIN Ghra_Staff D ON A.ApplyStaffNo = D.StaffNo + WHERE WorkNo IN (SELECT WorkNo + FROM Ghre_Teacher + WHERE WorkNo IS NOT NULL AND IsEnable=1) AND EnableYN = 'N'"; + + dt = await Db.Ado.GetDataTableAsync(sql); + + list = Db.Utilities.DataTableToList(dt); + + Log.Information($"【牛尾培训讲师同步】查询到待同步{list.Count}条数据"); + for (int i = 0; i < list.Count; i++) + { + Log.Information($"【牛尾培训讲师同步】同步队列{i + 1}/{list.Count}"); + + await Db.Updateable() + .SetColumns(it => new Ghre_Teacher() { IsEnable = 0 }) + .Where(it => it.TeacherNo == list[i].TeacherNo) + .ExecuteCommandAsync(); + + } } catch (Exception E) {