From dc194ff05d6e499f8d169ec3d3d3aeb7db09f08c Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 18 Oct 2024 18:25:16 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0,?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/AutoConfirmAppointmentJob.cs | 11 ++++------- .../Jobs/AutoRemoveAppointmentJob.cs | 6 +++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/Jobs/AutoConfirmAppointmentJob.cs b/Src/Dlhis.ScheduledTask/Jobs/AutoConfirmAppointmentJob.cs index 27a91a5b..671674c3 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/AutoConfirmAppointmentJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/AutoConfirmAppointmentJob.cs @@ -28,10 +28,7 @@ public class AutoConfirmAppointmentJob : BaseJob foreach (var detail in details) { - var gainfo = await DbContext.Queryable().Where(x => x.No == detail.UserNo).SingleAsync(); - var isExternal = gainfo.Type == GainfoUserTypeEnumType.External; - - var areaCodes = GetValidAreaCodes(isExternal, detail); + var areaCodes = GetValidAreaCodes(detail); var existsAreaCodes = await DbContext.Queryable().Where(x => areaCodes.Contains(x.CustomCode)).Select(x => x.CustomCode).ToListAsync(); //当前分配的设备组code @@ -57,9 +54,9 @@ public class AutoConfirmAppointmentJob : BaseJob }).ToList()); - if (detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived) + if (detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait) { - detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Leave; + detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Arrived; } await DbContext.UpdateAsync(detail); @@ -67,7 +64,7 @@ public class AutoConfirmAppointmentJob : BaseJob } - private static IEnumerable GetValidAreaCodes(bool isExternal, VisitorAppointmentDetailEntity detail) + private static IEnumerable GetValidAreaCodes(VisitorAppointmentDetailEntity detail) { var now = DateTime.Now; diff --git a/Src/Dlhis.ScheduledTask/Jobs/AutoRemoveAppointmentJob.cs b/Src/Dlhis.ScheduledTask/Jobs/AutoRemoveAppointmentJob.cs index d7987e8d..5f640525 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/AutoRemoveAppointmentJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/AutoRemoveAppointmentJob.cs @@ -56,7 +56,7 @@ public class AutoRemoveAppointmentJob : BaseJob { detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.Leave; } - + if (detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived) { detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Leave; @@ -71,12 +71,12 @@ public class AutoRemoveAppointmentJob : BaseJob { var now = DateTime.Now; - if (detail.IsEnterDoorArea && detail.DoorEnd >= now) + if (detail.IsEnterDoorArea && detail.DoorEnd <= now) { yield return detail.ApplyDoorArea; } - if (detail.IsEnterWorkplace && detail.WorkplaceEnd >= now) + if (detail.IsEnterWorkplace && detail.WorkplaceEnd <= now) { foreach (var item in detail.ApplyWorkplaceAreas) {