From 994318940d64e6327c9e970d1b4c7ef410984cc1 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 24 Apr 2025 15:37:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BE=8B=E5=A4=96=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87type=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DevicePermissionManuallyController.cs |  6 +++---
 .../Device/Request/DevicePermissionManuallyRequest.cs | 11 +++++++++++
 .../Response/DevicePermissionManuallyResponse.cs      |  6 ++++++
 .../Services/IDevicePermissionManuallyService.cs      |  2 +-
 .../Implements/DevicePermissionManuallyService.cs     |  6 ++++--
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 Src/Dlhis.Basic/Device/Request/DevicePermissionManuallyRequest.cs

diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionManuallyController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionManuallyController.cs
index 91a7c67f..ecb85ca9 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionManuallyController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionManuallyController.cs
@@ -23,13 +23,13 @@ public class DevicePermissionManuallyController : ControllerBase
     /// <summary>
     /// 数据分页
     /// </summary>
-    /// <param name="requestDto"></param>
+    /// <param name="request"></param>
     /// <returns></returns>
     [HttpGet("page")]
     [DataPermission]
-    public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync([FromQuery] PageDto requestDto)
+    public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync([FromQuery] DevicePermissionManuallyRequest request)
     {
-        return await _devicePermissionService.GetPageAsync(requestDto);
+        return await _devicePermissionService.GetPageAsync(request);
     }
 
     /// <summary>
diff --git a/Src/Dlhis.Basic/Device/Request/DevicePermissionManuallyRequest.cs b/Src/Dlhis.Basic/Device/Request/DevicePermissionManuallyRequest.cs
new file mode 100644
index 00000000..c4c5cefc
--- /dev/null
+++ b/Src/Dlhis.Basic/Device/Request/DevicePermissionManuallyRequest.cs
@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Entity.Device.Enums;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Device.Request;
+
+public class DevicePermissionManuallyRequest : PageDto
+{
+    [EnumDataType(typeof(DeviceTypeEnumType))]
+    public DeviceTypeEnumType? Type { get; set; }
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Response/DevicePermissionManuallyResponse.cs b/Src/Dlhis.Basic/Device/Response/DevicePermissionManuallyResponse.cs
index 4ca605e6..e7504b4f 100644
--- a/Src/Dlhis.Basic/Device/Response/DevicePermissionManuallyResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DevicePermissionManuallyResponse.cs
@@ -1,3 +1,6 @@
+using Dlhis.Entity.Device.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
 namespace Dlhis.Basic.Device.Response;
 
 public class DevicePermissionManuallyResponse
@@ -8,4 +11,7 @@ public class DevicePermissionManuallyResponse
     public string DeployPlace { get; set; }
     public string UserNo { get; set; }
     public string UserName { get; set; }
+
+    public DeviceTypeEnumType Type { get; set; }
+    public string TypeDesc => Type.GetDescription();
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Services/IDevicePermissionManuallyService.cs b/Src/Dlhis.Basic/Device/Services/IDevicePermissionManuallyService.cs
index 77273fa1..b0fe53ce 100644
--- a/Src/Dlhis.Basic/Device/Services/IDevicePermissionManuallyService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDevicePermissionManuallyService.cs
@@ -14,7 +14,7 @@ public interface IDevicePermissionManuallyService : IScopeDependency
     /// </summary>
     /// <param name="requestDto"></param>
     /// <returns></returns>
-    Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(PageDto requestDto);
+    Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(DevicePermissionManuallyRequest requestDto);
 
     /// <summary>
     /// 添加例外
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionManuallyService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionManuallyService.cs
index 28831e3f..421dedf8 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionManuallyService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionManuallyService.cs
@@ -21,12 +21,13 @@ public class DevicePermissionManuallyService : IDevicePermissionManuallyService
     }
 
     /// <inheritdoc />
-    public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(PageDto requestDto)
+    public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(DevicePermissionManuallyRequest requestDto)
     {
         return await _dbContext.Queryable<DevicePermissionManuallyEntity>()
             .LeftJoin<DeviceEntity>((x, d) => x.DeviceCode == d.Code)
             .LeftJoin<GainfoEntity>((x, d, g) => x.UserNo == g.No)
             .WhereIF(requestDto.Search.IsPresent(), (x, d, g) => g.Code == requestDto.Search || g.Name.Contains(requestDto.Search))
+            .WhereIF(requestDto.Type.HasValue, (x, d, g) => d.Type == requestDto.Type)
             .Select((x, d, g) => new DevicePermissionManuallyResponse
             {
                 Id = x.Id,
@@ -34,7 +35,8 @@ public class DevicePermissionManuallyService : IDevicePermissionManuallyService
                 DeviceUniqueNo = d.UniqueNo,
                 DeployPlace = d.DeployPlace,
                 UserNo = x.UserNo,
-                UserName = g.Code + " " + g.Name
+                UserName = g.Code + " " + g.Name,
+                Type = d.Type
             })
             .ToPageListAsync(requestDto);
     }