diff --git a/Src/Dlhis.ScheduledTask/Jobs/SyncPersonJob.cs b/Src/Dlhis.ScheduledTask/Jobs/SyncPersonJob.cs index c132a20b..0539701b 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/SyncPersonJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/SyncPersonJob.cs @@ -1,5 +1,7 @@ -using Dlhis.Entity.Basic.Entity; +using Dlhis.Basic.Api; +using Dlhis.Entity.Basic.Entity; using Dlhis.ScheduledTask.Attributes; +using Hangfire; using Kurisu.AspNetCore.Utils.Extensions; namespace Dlhis.ScheduledTask.Jobs; @@ -27,10 +29,9 @@ public class SyncPersonJob : BaseJob continue; } - //todo - // var jobKey = BackgroundJob.Enqueue(x => x.TodoByWerkAsync(werk.Werk)); - // werk.BackgroundJobKey = jobKey; - // await DbContext.UpdateAsync(werk); + var jobKey = BackgroundJob.Enqueue(x => x.SyncGainfoByWerkAsync(werk.Werk)); + werk.BackgroundJobKey = jobKey; + await DbContext.UpdateAsync(werk); Logger.LogInformation("SAP创建人事范围{werk}后台调度任务", werk.Werk); } diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs index 6c4171dc..c310bbfa 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs @@ -31,13 +31,14 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService .LeftJoin((deviceTask, device, ga) => deviceTask.UserNo == ga.No) .LeftJoin((deviceTask, device, ga, gaLeave) => deviceTask.UserNo == gaLeave.No) .LeftJoin((deviceTask, device, ga, gaLeave, deviceRegistry) => deviceRegistry.DeviceUniqueNo == deviceTask.DeviceUniqueNo) + .WhereIF(request.SearchDateTimePeriod.HasValue(), deviceTask => deviceTask.ModifiedTime >= request.SearchDateTimePeriod.Start + && deviceTask.ModifiedTime <= request.SearchDateTimePeriod.End + ) + .WhereIF(request.UserNo.IsPresent(), deviceTask => deviceTask.UserNo == request.UserNo) .Where(deviceTask => deviceTask.TenantId == request.Factory) .WhereIF(request.Type.HasValue, deviceTask => deviceTask.DeviceType == request.Type) - .WhereIF(request.SearchDateTimePeriod.HasValue(), deviceTask => deviceTask.ModifiedTime >= request.SearchDateTimePeriod.Start && deviceTask.ModifiedTime <= request.SearchDateTimePeriod.End - ) .WhereIF(request.TaskTypes.IsPresent(), deviceTask => request.TaskTypes.Contains(deviceTask.Type)) .WhereIF(request.Status.IsPresent(), deviceTask => request.Status.Contains(deviceTask.Status)) - .WhereIF(request.UserNo.IsPresent(), deviceTask => deviceTask.UserNo == request.UserNo) .WhereIF(!request.Search.IsEmpty(), (deviceTask, device, ga) => ga.Name == request.Search || ga.Code == request.Search