diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Dto/SapPositionItem.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Dto/SapPositionItem.cs index 1d14e766..7cb0d9ef 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Dto/SapPositionItem.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Dto/SapPositionItem.cs @@ -25,7 +25,7 @@ /// /// 岗位名称 /// - public string ZJOBANME { get; set; } + public string ZJOBNAME { get; set; } /// /// diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPositionJob.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPositionJob.cs index 1dbe1187..6be2f7f9 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPositionJob.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPositionJob.cs @@ -1,9 +1,7 @@ using Dlhis.Entity.Basic.Entity; -using Dlhis.ScheduledTask.SyncSapInfo.Comparers; using Dlhis.ScheduledTask.SyncSapInfo.Dto; using Dlhis.ScheduledTask.SyncSapInfo.Services; using Kurisu.SqlSugar.Services; -using Mapster; namespace Dlhis.ScheduledTask.SyncSapInfo.Job; @@ -12,7 +10,6 @@ namespace Dlhis.ScheduledTask.SyncSapInfo.Job; /// public class SyncPositionJob { - private List lastUpdatedPositionList = new List(); private readonly IDbContext _dbContext; private readonly IJinkoSapService _jinkoSapService; @@ -28,25 +25,12 @@ public class SyncPositionJob if (positionResult.Position != null && positionResult.Position.Items.Count > 0) { - var modifiedOrgList = GetModifiedPosition(positionResult.Position.Items); - await SaveOrg(modifiedOrgList); + await SaveOrg(positionResult.Position.Items); } } - private List GetModifiedPosition(List spaList) - { - if (lastUpdatedPositionList.Count <= 0) - { - return spaList; - } - var needRemove = spaList.Intersect(lastUpdatedPositionList, new SapPositionComparer()); - return spaList.Except(needRemove, new SapPositionComparer()).ToList(); - } - private async Task SaveOrg(List modifiedPostList) { - if (modifiedPostList == null || modifiedPostList.Count == 0) return; - var addItems = new List(); var updateItems = new List(); @@ -57,8 +41,8 @@ public class SyncPositionJob { position = new PositionEntity { - No = item.ZJOBANME, - Name = item.ZJOBANME, + No = item.ZDEPID, + Name = item.ZJOBNAME, DepartmentNo = item.ZDEPID, Grade = item.ZZWID }; @@ -67,7 +51,7 @@ public class SyncPositionJob } else { - position.Name = item.ZJOBANME; + position.Name = item.ZJOBNAME; position.DepartmentNo = item.ZDEPID; position.Grade = item.ZZWID;