设备检查项

ZR.Model/MES/dev/DeviceInspect.cs

@@ -20,10 +20,6 @@ namespace ZR.Model.MES.dev
         /// </summary>
         public string Image { get; set; }
 
-        /// <summary>
-        /// 检查顺序 
-        /// </summary>
-        public int? Sort { get; set; }
 
         /// <summary>
         /// 检查项类型（重点） 
@@ -38,7 +34,7 @@ namespace ZR.Model.MES.dev
         /// <summary>
         /// 检查项状态 
         /// </summary>
-        public string Status { get; set; }
+        public int Status { get; set; }
 
         /// <summary>
         /// 描述 

ZR.Model/MES/dev/Dto/DeviceInspectDto.cs

@@ -7,6 +7,10 @@ namespace ZR.Model.MES.dev
     /// </summary>
     public class DeviceInspectQueryDto : PagerInfo 
     {
+
+        public string Name { get; set; }
+
+        public int Status { get; set; }
     }
 
     /// <summary>
@@ -16,18 +20,13 @@ namespace ZR.Model.MES.dev
     {
         [Required(ErrorMessage = "id不能为空")]
         public int Id { get; set; }
-
-      
-
         public string Image { get; set; }
 
-        public int? Sort { get; set; }
-
         public string Type { get; set; }
 
         public string Remark { get; set; }
 
-        public string Status { get; set; }
+        public int Status { get; set; }
 
         public string Descride { get; set; }
 

ZR.Service/MES/dev/DeviceInspectService.cs

@@ -28,6 +28,9 @@ namespace ZR.Service.MES.dev
         {
             var predicate = Expressionable.Create<DeviceInspect>();
 
+            predicate.AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name))
+                .AndIF(parm.Status >= 0, it => it.Status == parm.Status);
+
             var response = Queryable()
                 .Where(predicate.ToExpression())
                 .ToPage<DeviceInspect, DeviceInspectDto>(parm);