diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs index f5f3b4f5..f3a029bc 100644 --- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs +++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs @@ -136,7 +136,7 @@ public class DevicePermissionsController : ControllerBase [HttpPost("temp-userPermissionCodes")] [IgnoreTenant] - public async Task GetAssignDeviceCodesAsync(List userCodes) + public async Task> GetAssignDeviceCodesAsync(List userCodes) { return await _devicePermissionService.GetUserDeviceCodesByNoAsync(userCodes); } diff --git a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs index a291b882..b8b39e45 100644 --- a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs @@ -64,5 +64,5 @@ public interface IDevicePermissionService : IScopeDependency Task GenerateDeleteDeviceTasksAsync(string deviceUniqueNo); - Task GetUserDeviceCodesByNoAsync(List userCodes); + Task> GetUserDeviceCodesByNoAsync(List userCodes); } \ No newline at end of file diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 346ab709..a10667a6 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -342,7 +342,7 @@ public class DevicePermissionService : IDevicePermissionService return deviceCodes.Concat(manuallyDeviceCodes).Distinct().ToList(); } - public async Task GetUserDeviceCodesByNoAsync(List userCodes) + public async Task> GetUserDeviceCodesByNoAsync(List userCodes) { var users = await _dbContext.Queryable().Where(x => userCodes.Contains(x.Code)).Select(x => new { x.No, x.Code, x.Name }).ToListAsync(); var userNos = users.Select(x => x.No).ToList(); @@ -364,13 +364,19 @@ public class DevicePermissionService : IDevicePermissionService var devices = await _dbContext.Queryable().ToListAsync(); - var finialResult = new List(); + var finialResult = new List(); foreach (var item in userWithDeviceCodes) { var userNo = item.Key; var user = users.First(x => x.No == userNo); - var details = devices.Where(x => item.Value.Contains(x.Code)).Select(x => new { UserCode = user.Code, UserName = user.Name, DeviceUniqueNo = x.UniqueNo, DeviceDeployPlace = x.DeployPlace }); + var details = devices.Where(x => item.Value.Contains(x.Code)).Select(x => new TempC + { + UserCode = user.Code, + UserName = user.Name, + DeviceUniqueNo = x.UniqueNo, + DeviceDeployPlace = x.DeployPlace + }); finialResult.AddRange(details); } diff --git a/Src/Dlhis.Basic/TempC.cs b/Src/Dlhis.Basic/TempC.cs new file mode 100644 index 00000000..5d55c648 --- /dev/null +++ b/Src/Dlhis.Basic/TempC.cs @@ -0,0 +1,16 @@ +namespace Dlhis.Basic +{ + public class TempC + { + //UserCode = user.Code, + // UserName = user.Name, + // DeviceUniqueNo = x.UniqueNo, + // DeviceDeployPlace = x.DeployPlace + + public string UserCode { get; set; } + public string UserName { get; set; } + + public string DeviceUniqueNo { get; set; } + public string DeviceDeployPlace { get; set; } + } +}