From 7e660dcf44af68006af28aa7e1680d18c82c08c5 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 4 Dec 2024 15:54:26 +0800 Subject: [PATCH] =?UTF-8?q?fix=20sql=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/AutoConfirmAppointmentJob.cs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/Jobs/AutoConfirmAppointmentJob.cs b/Src/Dlhis.ScheduledTask/Jobs/AutoConfirmAppointmentJob.cs index b5da125a..f87c9f01 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/AutoConfirmAppointmentJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/AutoConfirmAppointmentJob.cs @@ -23,7 +23,8 @@ public class AutoConfirmAppointmentJob : BaseJob protected override async Task RunAsync(IServiceProvider serviceProvider) { var details = await DbContext.Queryable() - .Where(x => x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait) + .Where(x => x.IsEnterDoorArea == false || (x.IsEnterDoorArea && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)) + .Where(x => x.IsEnterWorkplace && x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait && DateTime.Now >= x.WorkplaceStart) .ToListAsync(); foreach (var detail in details) @@ -70,15 +71,6 @@ public class AutoConfirmAppointmentJob : BaseJob private static IEnumerable GetValidAreaCodes(VisitorAppointmentDetailEntity detail) { - var now = DateTime.Now; - - var before = (detail.IsEnterDoorArea = false) || (detail.IsEnterDoorArea && detail.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived); - if (before && detail.IsEnterWorkplace && detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait && now >= detail.WorkplaceStart) - { - foreach (var item in detail.ApplyWorkplaceAreas) - { - yield return item; - } - } + return detail.ApplyWorkplaceAreas; } } \ No newline at end of file