From 5733a3907f17b9fca5d0df3a538a13af62b7aaa2 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 19 Jul 2024 16:10:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4=E6=97=B6=E6=AE=B5?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Basic/Device/Dtos/DeviceTimePeriodDto.cs    | 11 -----------
 .../Device/Request/DeviceTimePeriodSaveRequest.cs     |  3 ++-
 .../Device/Response/DeviceTimePeriodResponse.cs       |  7 +++++--
 .../Services/Implements/DeviceTimePeriodService.cs    |  3 ---
 4 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 Src/Dlhis.Basic/Device/Dtos/DeviceTimePeriodDto.cs

diff --git a/Src/Dlhis.Basic/Device/Dtos/DeviceTimePeriodDto.cs b/Src/Dlhis.Basic/Device/Dtos/DeviceTimePeriodDto.cs
deleted file mode 100644
index 982077ad..00000000
--- a/Src/Dlhis.Basic/Device/Dtos/DeviceTimePeriodDto.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Dlhis.Basic.Device.Dtos;
-
-public class DeviceTimePeriodDto
-{
-    public int CardType { get; set; }
-    public TimeOnly OnStart { get; set; }
-    public TimeOnly OnEnd { get; set; }
-
-    public TimeOnly OffStart { get; set; }
-    public TimeOnly OffEnd { get; set; }
-}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Request/DeviceTimePeriodSaveRequest.cs b/Src/Dlhis.Basic/Device/Request/DeviceTimePeriodSaveRequest.cs
index ffec74b3..31f98c05 100644
--- a/Src/Dlhis.Basic/Device/Request/DeviceTimePeriodSaveRequest.cs
+++ b/Src/Dlhis.Basic/Device/Request/DeviceTimePeriodSaveRequest.cs
@@ -1,9 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using Dlhis.Entity.Device.Enums;
+using Dlhis.Entity.Device.Models;
 
 namespace Dlhis.Basic.Device.Request;
 
-public class DeviceTimePeriodSaveRequest : IValidatableObject
+public class DeviceTimePeriodSaveRequest
 {
     public long? Id { get; set; }
 
diff --git a/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs b/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs
index 70266d5d..23dd992c 100644
--- a/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs
@@ -3,9 +3,12 @@ using Dlhis.Entity.Device.Models;
 
 namespace Dlhis.Basic.Device.Response;
 
-public class DeviceTimePeriodResponse
+public class DeviceTimePeriodResponse 
 {
-    public long Id { get; set; }
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; }
     
     /// <summary>
     /// 名称
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs
index e05a706d..1ab79451 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs
@@ -1,4 +1,3 @@
-using Dlhis.Basic.Device.Dtos;
 using Dlhis.Basic.Device.Request;
 using Dlhis.Basic.Device.Response;
 using Dlhis.Entity.Basic.Entity;
@@ -27,7 +26,6 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
     {
         var pageOri = await _dbContext.Queryable<DeviceTimePeriodEntity>()
             .Where(x => x.AssignType == request.AssignType)
-            .Select<DeviceTimePeriodResponse>()
             .ToPageListAsync(request);
 
         var page = pageOri.Adapt<Pagination<DeviceTimePeriodResponse>>();
@@ -195,7 +193,6 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
                 .Where(item => item.AssignType == DeviceTimePeriodAssignEnumType.Device && item.Value == x.Code)
                 .ToList();
 
-
             foreach (var setting in dSettings)
             {
                 var s = tSettings.FirstOrDefault(item => item.CardType == setting.CardType);