diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs index ef16b0b8..a920e052 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs @@ -228,34 +228,20 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService public async Task DispositionDeviceAsync(DispositionDeviceRequest request) { - var places = await _dbContext.Queryable().ToListAsync(); - var place = places.Where(x => x.Code.ToString() == request.PlaceCode).First(); - place.ThrowIfNull($"{request.PlaceCode}:该营业点不存在"); + var place = await _dbContext.Queryable().Where(x => x.Code == request.PlaceCode).SingleAsync(); + place.ThrowIfNull("营业点不存在"); - var devices = await _dbContext.Queryable().ToListAsync(); - - if (request.UniqueNos != null && request.UniqueNos.Count > 0) - { - foreach (var no in request.UniqueNos) - { - var device = devices.Where(x => x.UniqueNo == no).FirstOrDefault(); - device.ThrowIfNull($"{no}:设备不存在"); - } - } - - var regiss = await _dbContext.Queryable() + var registries = await _dbContext.Queryable() .Where(x => request.UniqueNos.Contains(x.DeviceUniqueNo)) .ToListAsync(); - var list = new List(); - - foreach (var regis in regiss) + foreach (var item in registries) { - regis.BusinessPlaceCode = place.Code; - regis.BusinessPlaceCustomCode = place.CustomCode; - list.Add(regis); + item.BusinessPlaceCode = request.PlaceCode; + item.BusinessPlaceCustomCode = place.CustomCode; } - await _dbContext.UpdateAsync(list); + + await _dbContext.UpdateAsync(registries); } //*********************************************** help methods ***************************************************// diff --git a/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs index dc4acda4..11a0dd6e 100644 --- a/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs +++ b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs @@ -118,12 +118,12 @@ public class BusinessPlacesController : ControllerBase } /// - /// 营业点增加配置设备接口 + /// 营业点增加配置设备 /// /// /// [HttpPost("disposition")] - public async Task DispositionDeviceAsync([FromQuery] DispositionDeviceRequest request) + public async Task DispositionDeviceAsync(DispositionDeviceRequest request) { await _businessPlaceShiftService.DispositionDeviceAsync(request); } diff --git a/Src/Dlhis.Basic/Places/Request/DispositionDeviceRequest.cs b/Src/Dlhis.Basic/Places/Request/DispositionDeviceRequest.cs index 56b7c5f4..bcbc371a 100644 --- a/Src/Dlhis.Basic/Places/Request/DispositionDeviceRequest.cs +++ b/Src/Dlhis.Basic/Places/Request/DispositionDeviceRequest.cs @@ -1,9 +1,12 @@ -namespace Dlhis.Basic.Places.Request -{ - public class DispositionDeviceRequest - { - public string PlaceCode { get; set; } +using System.ComponentModel.DataAnnotations; - public List UniqueNos { get; set; } - } +namespace Dlhis.Basic.Places.Request; + +public class DispositionDeviceRequest +{ + [Required] + public Guid PlaceCode { get; set; } + + [MinLength(1)] + public List UniqueNos { get; set; } }