From 6f1514932162e3d55f89a79000870a33528ab235 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Tue, 5 Mar 2024 16:03:57 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=90=A5=E4=B8=9A=E7=82=B9=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8B=E9=9D=A2=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/BusinessPlacesController.cs   |  3 ++-
 .../Request/BusinessPlaceGetByCodeRequest.cs  |  5 ++--
 .../Response/DeviceCodeNameDetail.cs          |  2 ++
 .../Services/IBusinessPlaceShiftService.cs    |  2 +-
 .../Implements/BusinessPlaceShiftService.cs   | 27 ++++++++++++++++++-
 5 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
index 557100dc..cc72eb4f 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
@@ -99,7 +99,8 @@ public class BusinessPlacesController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    public async Task GetDevicesByCode(BusinessPlaceGetByCodeRequest request)
+    [HttpGet("devicenos")]
+    public async Task<List<DeviceCodeNameDetail>> GetDevicesByCode([FromQuery]BusinessPlaceGetByCodeRequest request)
     {
         return await _businessPlaceShiftService.GetDevicesByCode(request);
     }
diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs b/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs
index 7aaa6060..5177dd0c 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs
@@ -1,8 +1,9 @@
-using System.ComponentModel.DataAnnotations;
+using Kurisu.Core.DataAccess.Dto;
+using System.ComponentModel.DataAnnotations;
 
 namespace Dlhis.Basic.BusinessPlace.Request
 {
-    public class BusinessPlaceGetByCodeRequest
+    public class BusinessPlaceGetByCodeRequest : PageDto
     {
         /// <summary>
         /// 营业点号
diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs b/Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs
index fb7d0426..0841c315 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs
@@ -2,5 +2,7 @@
 {
     public class DeviceCodeNameDetail
     {
+        public string UniqueNo { get; set; }
+        public string UniqueName { get; set; }
     }
 }
diff --git a/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs
index 70b32573..3a88f5db 100644
--- a/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs
+++ b/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs
@@ -18,5 +18,5 @@ public interface IBusinessPlaceShiftService : IScopeDependency
 
     Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeAsync(string placeCustomCode);
 
-    Task GetDevicesByCode(BusinessPlaceGetByCodeRequest request);
+    Task<List<DeviceCodeNameDetail>> GetDevicesByCode(BusinessPlaceGetByCodeRequest request);
 }
diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
index ec61ffb4..a0636ae0 100644
--- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
+++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
@@ -3,6 +3,7 @@ using Dlhis.Basic.BusinessPlace.Response;
 using Dlhis.Basic.BusinessShift.Request;
 using Dlhis.Basic.BusinessShift.Response;
 using Dlhis.Entity.Basic.Entity;
+using Dlhis.Entity.Device.Entities;
 using Dlhis.Sys.Api;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.CustomClass;
@@ -189,9 +190,33 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
         };
     }
 
-    public async Task<List<>> GetDevicesByCode(BusinessPlaceGetByCodeRequest request)
+    public async Task<List<DeviceCodeNameDetail>> GetDevicesByCode(BusinessPlaceGetByCodeRequest request)
     {
+        var regiss = await _dbContext.Queryable<DeviceRegistryEntity>()
+            .Where(x => x.BusinessPlaceCode.ToString() == request.Code)
+            .ToListAsync();
 
+        var devices = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
+            
+        var list = new List<DeviceCodeNameDetail>();
+        if (regiss.Count > 0)
+        {
+            foreach (var regis in regiss)
+            {
+                var device = devices.Where(x => x.UniqueNo == regis.DeviceUniqueNo)
+                    .FirstOrDefault();
+                if (device != null)
+                {
+                    var detail = new DeviceCodeNameDetail
+                    {
+                        UniqueNo = regis.DeviceUniqueNo,
+                        UniqueName = device.Supplier
+                    };
+                    list.Add(detail);
+                }
+            }
+        }
+        return list;
     }
 
     //*********************************************** help methods ***************************************************//