diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncOriginCardInfoJob.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncOriginCardInfoJob.cs index 96a7daa4..88f2c0f5 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncOriginCardInfoJob.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncOriginCardInfoJob.cs @@ -30,6 +30,8 @@ public class SyncOriginCardInfoJob public async Task RunAsync() { + _logger.LogInformation("调度任务:{job}.开始执行", nameof(SyncOriginCardInfoJob)); + _dbContext.Client.QueryFilter.ClearAndBackup(); _sqlSugarOptionsService.IgnoreTenant = true; try @@ -49,14 +51,14 @@ public class SyncOriginCardInfoJob //获取人员信息 var userCodes = logs.Select(x => x.UserUniqueNo).ToList(); - var gainfos = await _dbContext.Queryable().Where(x => userCodes.Contains(x.Code)).Select(x => new { x.Code, x.CardNo }).ToListAsync(); + var gainfoCodes = await _dbContext.Queryable().Where(x => userCodes.Contains(x.Code)).Select(x => x.Code).ToListAsync(); var requests = logs.Select(x => new UploadAttendanceRequest { Id = x.Id, RaiseDateTime = x.RaiseDateTime, ZNOTE = devices.First(item => item.UniqueNo == x.DeviceUniqueNo).DeployPlace, - ZWORKCODE = gainfos.FirstOrDefault(item => item.Code == x.UserUniqueNo)?.Code?.TrimEnd('\0'), + ZWORKCODE = gainfoCodes.Contains(x.UserUniqueNo) ? x.UserUniqueNo?.TrimEnd('\0') : string.Empty, }).Where(x => x.ZWORKCODE.IsPresent()).ToList(); @@ -86,6 +88,8 @@ public class SyncOriginCardInfoJob { _sqlSugarOptionsService.IgnoreTenant = false; _dbContext.Client.QueryFilter.Restore(); + + _logger.LogInformation("调度任务:{job}.结束", nameof(SyncOriginCardInfoJob)); } } } diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs index 8a30c9f7..944774bf 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncPersonJob.cs @@ -36,6 +36,7 @@ public class SyncPersonJob public async Task RunAsync() { + _logger.LogInformation("开始获取SAP人员"); var personResp = await _jinkoSapService.GetPersonsAsync(); var persons = personResp.Person.Items; _departmentChanges = personResp.DepartmentInfo.Items; @@ -56,6 +57,8 @@ public class SyncPersonJob } }); } + + _logger.LogInformation("同步SAP人员数据结束"); } private async Task SavePerson(List persons) diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs index 05ceed7c..bfd27a08 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs @@ -115,7 +115,7 @@ public class JinkoSapService : IJinkoSapService } catch (Exception ex) { - _logger.LogError(ex, "获取人事范围{werk}失败:" + ex.Message, item); + _logger.LogError(ex, "获取人事范围{werk}失败:" + ex.Message, item.Werk); } }