fix 时段码分页

Src/Dlhis.Basic/Device/Controllers/DeviceTimePeriodsController.cs

@@ -30,7 +30,7 @@ public class DeviceTimePeriodsController : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpGet("page")]
-    public async Task<Pagination<DeviceTimePeriodResponse>> GetPageAsync([FromQuery] DeviceTimePeriodPageRequest request)
+    public async Task<Pagination<DeviceTimePeriodPageResponse>> GetPageAsync([FromQuery] DeviceTimePeriodPageRequest request)
     {
         return await _deviceTimePeriodService.GetPageAsync(request);
     }

Src/Dlhis.Basic/Device/Response/DeviceTimePeriodPageResponse.cs

@@ -0,0 +1,21 @@
+using Dlhis.Entity.Device.Enums;
+
+namespace Dlhis.Basic.Device.Response;
+
+public class DeviceTimePeriodPageResponse
+{
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; }
+    
+    /// <summary>
+    /// 分配类型
+    /// </summary>
+    public DeviceTimePeriodAssignEnumType AssignType { get; set; }
+
+    /// <summary>
+    /// 分配值
+    /// </summary>
+    public Guid Value { get; set; }
+}

Src/Dlhis.Basic/Device/Services/IDeviceTimePeriodService.cs

@@ -7,7 +7,7 @@ namespace Dlhis.Basic.Device.Services;
 
 public interface IDeviceTimePeriodService : IScopeDependency
 {
-    Task<Pagination<DeviceTimePeriodResponse>> GetPageAsync(DeviceTimePeriodPageRequest request);
+    Task<Pagination<DeviceTimePeriodPageResponse>> GetPageAsync(DeviceTimePeriodPageRequest request);
 
     Task SaveAsync(DeviceTimePeriodSaveRequest request);
 

Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs

@@ -22,25 +22,26 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
     }
 
     /// <inheritdoc />
-    public async Task<Pagination<DeviceTimePeriodResponse>> GetPageAsync(DeviceTimePeriodPageRequest request)
+    public async Task<Pagination<DeviceTimePeriodPageResponse>> GetPageAsync(DeviceTimePeriodPageRequest request)
     {
-        var pageOri = await _dbContext.Queryable<DeviceTimePeriodEntity>()
+        var page = await _dbContext.Queryable<DeviceTimePeriodEntity>()
             .Where(x => x.AssignType == request.AssignType)
+            .GroupBy(x => new { x.AssignType, x.Value })
+            .Select(x => new DeviceTimePeriodPageResponse
+            {
+                AssignType = x.AssignType,
+                Value = x.Value
+            })
             .ToPageListAsync(request);
-
+        
-        var page = pageOri.Adapt<Pagination<DeviceTimePeriodResponse>>();
-
         var values = page.Data.Select(x => x.Value);
         var data = request.AssignType == DeviceTimePeriodAssignEnumType.Device
             ? await _dbContext.Queryable<DeviceEntity>().Where(x => values.Contains(x.Code)).Select(x => new { x.Code, Name = x.DeployPlace }).ToListAsync()
             : await _dbContext.Queryable<DeviceTemplateEntity>().Where(x => values.Contains(x.Code)).Select(x => new { x.Code, x.Name }).ToListAsync();
 
-        var basicTypes = await _dbContext.Queryable<BasicTypeEntity>().Where(x => x.Type == "timeperiod").ToListAsync();
-
         page.Data.ForEach(item =>
         {
             item.Name = data.FirstOrDefault(x => x.Code == item.Value)?.Name;
-            item.CardTypeDesc = basicTypes.FirstOrDefault(x => x.Code == item.CardType.ToString())?.Display;
         });
 
         return page;