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

fix 强退人员增加Arrived和Wait判断处理

Browse Source
This commit is contained in:
liguoyang
2025-06-11 10:13:52 +08:00
parent 34c537a962
commit 5eb7d3fefa
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
View File

@@ -186,14 +186,16 @@ public class AppointmentService : IAppointmentService
detail.ThrowIfNull("数据不存在"); detail.ThrowIfNull("数据不存在");
if (detail.IsEnterDoorArea && detail.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived) if (detail.IsEnterDoorArea && detail.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
{
detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.FocusLeave; detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.FocusLeave;
}
if (detail.IsEnterDoorArea && detail.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait)
detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.Obsolete;
if (detail.IsEnterWorkplace && detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived) if (detail.IsEnterWorkplace && detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
{
detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.FocusLeave; detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.FocusLeave;
}
if (detail.IsEnterWorkplace && detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait)
detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Obsolete;
detail.FocusLeaveDateTime = DateTime.Now; detail.FocusLeaveDateTime = DateTime.Now;
detail.Remark += "强制离场原因:" + reason; detail.Remark += "强制离场原因:" + reason;
@@ -401,7 +403,7 @@ public class AppointmentService : IAppointmentService
{ {
var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.IdNo == detail.IdNo || x.Code == detail.IdNo).SingleAsync(); var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.IdNo == detail.IdNo || x.Code == detail.IdNo).SingleAsync();
gainfo.ThrowIfNull("人员信息不存在"); gainfo.ThrowIfNull("人员信息不存在");
var areaCodes = GetValidAreaCodes(detail, withWorkplace).ToList(); var areaCodes = GetValidAreaCodes(detail, withWorkplace).ToList();
if (areaCodes.IsEmpty()) return; if (areaCodes.IsEmpty()) return;

5
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -269,7 +269,10 @@ public class GainfoService : IGainfoService
{ {
var visitorAppointmentDetails = await _dbContext.Queryable<VisitorAppointmentDetailEntity>() var visitorAppointmentDetails = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.Where(x => x.UserNo == gainfo.No) .Where(x => x.UserNo == gainfo.No)
.Where(x => x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait || x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait) .Where(x => x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait
|| x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait
|| x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived
|| x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
.ToListAsync(); .ToListAsync();