diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index bdf243c1..92d90627 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -2,6 +2,7 @@ using Dlhis.Basic.Device.Response; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Device.Entities; +using Dlhis.Entity.Device.Enums; using Kurisu.AspNetCore.UnifyResultAndValidation; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; @@ -154,7 +155,7 @@ public class DeviceService : IDeviceService public async Task> GetDeviceByNoAsync(DevicePageRequest request) { var page = await _dbContext.Queryable() - .Where(x=>x.UniqueNo == request.UniqueNo) + .Where(x => x.UniqueNo == request.UniqueNo) .Select(device => new DeviceResponse { FuncsStr = device.Funcs.ToString() @@ -165,9 +166,17 @@ public class DeviceService : IDeviceService return page; } - public Task> GetAttendanceDevicesAsync() + public async Task> GetAttendanceDevicesAsync() { - throw new NotImplementedException(); + var devices = await _dbContext.Queryable() + .Where(x => x.Enable) + .Select(x => new DeviceResponse + { + FuncsStr = x.Funcs.ToString() + }, true) + .ToListAsync(); + + return devices.Where(x => x.Funcs.Contains(DeviceFuncEnumType.Attendance)).ToList(); } }