diff --git a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs index fd720cc3..2f2db64c 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs @@ -676,7 +676,7 @@ FROM Ghre_Request A CreateProg, DeptNo, StaffNo, - LastUpdateDate,TrainStaffId) + LastUpdateDate,TrainStaffId,TrainClass,InOrOut) SELECT A.Id, A.RequestSource, c.DeptName, @@ -697,19 +697,62 @@ FROM Ghre_Request A SELECT ',' + S.StaffNo FROM OPENJSON(A.TrainStaffId) WITH (TrainStaffId INT '$') AS JsonData INNER JOIN Ghra_Staff S ON JsonData.TrainStaffId = S.StaffID - FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS StaffNames + FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS StaffNames,A.TrainClass,A.InOrOut FROM Ghre_Request A LEFT JOIN [120.26.205.42].[GhrUshio].[dbo].Ghre_GHR50Request B ON B.RequestID = A.Id LEFT JOIN Ghro_Dept C ON a.DeptId = c.DeptID LEFT JOIN Ghra_Staff D ON a.ApplicantId = D.StaffID LEFT JOIN Ghre_Course E ON a.CourseId = E.Id - WHERE A.WorkNo IS NULL AND B.RequestID IS NULL; - + WHERE A.TrainClass='Temporary' AND A.WorkNo IS NULL AND B.RequestID IS NULL; +INSERT INTO [120.26.205.42].[GhrUshio].[dbo].Ghre_GHR50Plan (PlanID, + IsEnable, + CreateBy, + CreateDate, + LastUpdateDate, + CreateProg, + DeptNo, --部门编号 + DeptName, --部门名称 + TrainYear, --年份 + TrainMonth, --计划实施月份 + CourseID, --课程ID + CourseName, --课程名称 + TrainDays, --培训天数 + TrainStaffId, --培训对象 工号拼接 + TrainNum --培训人数 + ) + SELECT A.Id, + 1, + A.CreateBy, + A.CreateTime, + isnull (A.UpdateTime, ''), + '', + C.DeptNo, + C.DeptName, + A.[Year], + A.Month, + A.CourseId, + ISNULL (E.CourseName, A.CourseName), + A.TrainDays, + A.StaffIds, + A.TrainNum + FROM Ghre_UshioPlan A + LEFT JOIN [120.26.205.42].[GhrUshio].[dbo].Ghre_GHR50Plan B + ON B.PlanID = A.Id + LEFT JOIN Ghro_Dept C ON a.DeptId = c.DeptID + LEFT JOIN Ghre_Course E ON a.CourseId = E.Id + WHERE A.IsEnable = 1 AND B.PlanID IS NULL; UPDATE A -SET A.IsEnable = B.IsEnable +SET A.IsEnable = B.IsEnable,A.LastUpdateDate=isnull (B.UpdateTime, B.CreateTime) FROM [120.26.205.42].[GhrUshio].[dbo].Ghre_GHR50Request A JOIN Ghre_Request B ON a.RequestID = B.Id +WHERE B.IsEnable ! = A.IsEnable + OR isnull (B.UpdateTime, B.CreateTime) ! = A.LastUpdateDate; + +UPDATE A +SET A.IsEnable = B.IsEnable,A.LastUpdateDate=isnull (B.UpdateTime, B.CreateTime) +FROM [120.26.205.42].[GhrUshio].[dbo].Ghre_GHR50Plan A + JOIN Ghre_UshioPlan B ON a.PlanID = B.Id WHERE B.IsEnable ! = A.IsEnable OR isnull (B.UpdateTime, B.CreateTime) ! = A.LastUpdateDate"; await Db.Ado.ExecuteCommandAsync(sql);