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
2025-12-19 10:34:55 +08:00
parent cefc35030b
commit 8be9468a8b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,6 +347,7 @@ public class AppointmentService : IAppointmentService
var gainfoLeaves = await _dbContext.Queryable<GainfoLeaveEntity>() var gainfoLeaves = await _dbContext.Queryable<GainfoLeaveEntity>()
.Where(x => x.Type == GainfoUserTypeEnumType.External) .Where(x => x.Type == GainfoUserTypeEnumType.External)
.Where(x => SqlFunc.DateIsSame(x.ResignationDate, day)) .Where(x => SqlFunc.DateIsSame(x.ResignationDate, day))
.Where(x => SqlFunc.Subqueryable<GainfoEntity>().Where(p => p.No == x.No).NotAny())
.ToListAsync(); .ToListAsync();
foreach (var gainfoLeave in gainfoLeaves) foreach (var gainfoLeave in gainfoLeaves)
@@ -359,9 +360,17 @@ public class AppointmentService : IAppointmentService
await _dbContext.InsertAsync(gainfo); await _dbContext.InsertAsync(gainfo);
await _dbContext.DeleteReallyAsync(gainfoLeave); await _dbContext.DeleteReallyAsync(gainfoLeave);
var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.UserNo == gainfo.No).SingleAsync(); var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.UserNo == gainfo.No).OrderByDescending(x => x.Id).FirstAsync();
detail.ThrowIfNull("数据不存在"); detail.ThrowIfNull("数据不存在");
if (detail.IsEnterDoorArea)
{
detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.Arrived;
}
if (detail.IsEnterWorkplace)
{
detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Arrived;
}
await _dbContext.UpdateAsync(detail);
await GenerateDeviceTasksAsync(detail, true, DeviceTaskEnumType.Update, "数据恢复"); await GenerateDeviceTasksAsync(detail, true, DeviceTaskEnumType.Update, "数据恢复");
await _dbContext.Client.Ado.CommitTranAsync(); await _dbContext.Client.Ado.CommitTranAsync();