fix 退款重算,访客数据过滤
This commit is contained in:
@@ -210,7 +210,10 @@ public class AppointmentService : IAppointmentService
|
|||||||
{
|
{
|
||||||
return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
|
return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
|
||||||
.LeftJoin<GainfoEntity>((x, ga) => ga.IdNo == x.IdNo)
|
.LeftJoin<GainfoEntity>((x, ga) => ga.IdNo == x.IdNo)
|
||||||
.Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.Factory == factory).Any())
|
.Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>()
|
||||||
|
.Where(p => p.No == x.No)
|
||||||
|
.Where(p => p.Factory == factory).Any()
|
||||||
|
)
|
||||||
.Where(x => x.IsEnterDoorArea)
|
.Where(x => x.IsEnterDoorArea)
|
||||||
.WhereIF(status.HasValue, x => x.DoorStatus == status)
|
.WhereIF(status.HasValue, x => x.DoorStatus == status)
|
||||||
.Where(x => x.DoorStart >= start && x.DoorEnd <= end)
|
.Where(x => x.DoorStart >= start && x.DoorEnd <= end)
|
||||||
|
|||||||
@@ -145,6 +145,10 @@ public class BalanceService : IBalanceService
|
|||||||
.ExecuteCommandThrowVersionAsync();
|
.ExecuteCommandThrowVersionAsync();
|
||||||
}, 5);
|
}, 5);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await _balanceRepository.CalculateBalanceAsync(balanceRecord.UserCode);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user