yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 状态更新,时间判断

Browse Source
This commit is contained in:
liguoyang
2024-10-18 18:25:16 +08:00
parent 1b486f61ad
commit dc194ff05d
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Src/Dlhis.ScheduledTask/Jobs/AutoConfirmAppointmentJob.cs
View File

@@ -28,10 +28,7 @@ public class AutoConfirmAppointmentJob : BaseJob
foreach (var detail in details)
{
var gainfo = await DbContext.Queryable<GainfoEntity>().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<AppointmentAreaEntity>().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<string> GetValidAreaCodes(bool isExternal, VisitorAppointmentDetailEntity detail)
private static IEnumerable<string> GetValidAreaCodes(VisitorAppointmentDetailEntity detail)
{
var now = DateTime.Now;

6
Src/Dlhis.ScheduledTask/Jobs/AutoRemoveAppointmentJob.cs
View File

@@ -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)
{