优化查询页面

Author: nnhy

AntJob.Data/Entity/作业.Biz.cs

@@ -202,7 +202,7 @@ public static IEnumerable<Job> Search(Int32 id, Int32 appid, DateTime start, Dat
         if (id > 0) exp &= _.ID == id;
         if (appid > 0) exp &= _.AppID == appid;
         if (mode > 0) exp &= _.Mode == mode;
-        if (!key.IsNullOrEmpty()) exp &= _.Name.Contains(key);
+        if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
         exp &= _.CreateTime.Between(start, end);
 
         return FindAll(exp, p);

AntJob.Data/Entity/作业任务.Biz.cs

@@ -164,7 +164,7 @@ public static IEnumerable<JobTask> Search(Int32 id, Int32 appid, Int32 jobid, Jo
         if (jobid >= 0) exp &= _.JobID == jobid;
         if (status >= JobStatus.就绪) exp &= _.Status == status;
         if (!client.IsNullOrEmpty()) exp &= _.Client == client;
-        if (!key.IsNullOrEmpty()) exp &= _.Data.Contains(key) | _.Remark.Contains(key) | _.Key == key;
+        if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
 
         exp &= _.DataTime.Between(dataStart, dataEnd);
         exp &= _.UpdateTime.Between(start, end);

AntJob.Data/Entity/作业错误.Biz.cs

@@ -116,7 +116,7 @@ public static IEnumerable<JobError> Search(Int32 appid, Int32 jobid, String clie
         if (appid > 0) exp &= _.AppID == appid;
         if (jobid > 0) exp &= _.JobID == jobid;
         if (!client.IsNullOrEmpty()) exp &= _.Client == client;
-        if (!key.IsNullOrEmpty()) exp &= _.Remark.Contains(key);
+        if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
         exp &= _.DataTime.Between(start, end);
 
         return FindAll(exp, p);

AntJob.Data/Entity/应用历史.Biz.cs

@@ -93,10 +93,7 @@ public static IList<AppHistory> Search(Int32 appid, String action, Boolean? succ
         exp &= _.Id.Between(start, end, Meta.Factory.Snow);
         //exp &= _.CreateTime.Between(start, end);
 
-        if (!key.IsNullOrEmpty())
-        {
-            exp &= (_.Name.Contains(key) | _.Remark.Contains(key) | _.CreateIP.Contains(key));
-        }
+        if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
 
         return FindAll(exp, page);
     }

AntJob.Data/Entity/应用在线.Biz.cs

@@ -100,7 +100,7 @@ public static IEnumerable<AppOnline> Search(Int32 appid, DateTime start, DateTim
         var exp = new WhereExpression();
 
         if (appid > 0) exp &= _.AppID == appid.ToInt();
-        if (!key.IsNullOrEmpty()) exp &= _.Name.Contains(key) | _.Instance.Contains(key);
+        if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
         exp &= _.CreateTime.Between(start, end);
 
         return FindAll(exp, p);

AntJob.Data/Entity/应用消息.Biz.cs

@@ -101,7 +101,7 @@ public static IEnumerable<AppMessage> Search(Int32 appid, Int32 jobid, DateTime
 
         if (appid > 0) exp &= _.AppID == appid;
         if (jobid > 0) exp &= _.JobID == jobid;
-        if (!key.IsNullOrEmpty()) exp &= _.Topic.Contains(key) | _.Data.Contains(key);
+        if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
 
         exp &= _.Id.Between(start, end, Meta.Factory.Snow);
         //exp &= _.UpdateTime.Between(start, end);

AntJob.Data/Entity/应用系统.Biz.cs

@@ -87,7 +87,7 @@ public static IEnumerable<App> Search(String category, Boolean? enable, String k
         if (enable != null) exp &= _.Enable == enable;
         if (!category.IsNullOrEmpty()) exp &= _.Category == category;
 
-        if (!key.IsNullOrEmpty()) exp &= _.Name.Contains(key) | _.DisplayName.Contains(key);
+        if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
 
         return FindAll(exp, p);
     }