From 8f205f345cc550c5af8e430b837a25f51a829f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=AD=94=E4=BB=99?=
 <13068499+willowhh@user.noreply.gitee.com>
Date: Tue, 6 May 2025 15:02:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/dev/Dto/DeviceUptimeQueryDto.cs | 18 ++++++++++++++++++
 DOAN.Service/MES/dev/DeviceUptimeService.cs    |  2 --
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/DOAN.Model/MES/dev/Dto/DeviceUptimeQueryDto.cs b/DOAN.Model/MES/dev/Dto/DeviceUptimeQueryDto.cs
index 3b67385..1b7160f 100644
--- a/DOAN.Model/MES/dev/Dto/DeviceUptimeQueryDto.cs
+++ b/DOAN.Model/MES/dev/Dto/DeviceUptimeQueryDto.cs
@@ -11,6 +11,24 @@ namespace DOAN.Model.MES.dev.Dto
     /// </summary>
     public class DeviceUptimeQueryDto : PagerInfo
     {
+        public string Id { get; set; }
+
+        public string targetValue { get; set; }
+
+        public string ActualValue { get; set; }
+
+        public string Workshop { get; set; }
+
+        public string FillTime { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+        public string Type { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Service/MES/dev/DeviceUptimeService.cs b/DOAN.Service/MES/dev/DeviceUptimeService.cs
index 3163e8a..68cdae9 100644
--- a/DOAN.Service/MES/dev/DeviceUptimeService.cs
+++ b/DOAN.Service/MES/dev/DeviceUptimeService.cs
@@ -32,8 +32,6 @@ namespace DOAN.Service.MES.dev
                 .AndIF(!string.IsNullOrEmpty(parm.Workshop), it => parm.Workshop == it.Workshop);
 
             var response = Queryable()
-                .WhereIF(!string.IsNullOrEmpty(parm.Workshop),x=>x.Workshop==parm.Workshop)
-                .WhereIF(!string.IsNullOrEmpty(parm.Type),x=>x.Type==parm.Type)
                 .Where(predicate.ToExpression())
                 .ToPage<DeviceUptime, DeviceUptimeDto>(parm);