2023-11-08

SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs

@@ -17,8 +17,7 @@ namespace BLL
         /// </summary>
         public static int Count { get; set; }
 
-        public static List<PHTGL_ContractTrackProgress> GetPHTGL_ContractTrackProgressByModle(
-            PHTGL_ContractTrackProgress table)
+        public static IQueryable<PHTGL_ContractTrackProgress> GetPHTGL_ContractTrackProgressByModle( PHTGL_ContractTrackProgress table)
         {
             var q = from x in Funs.DB.PHTGL_ContractTrackProgress
                     where
@@ -31,10 +30,23 @@ namespace BLL
                         orderby x.Date
                     select x
                 ;
-
-            return q.ToList();
+            return q;
+        }
+        public static  PHTGL_ContractTrackProgress GetFirstOrDefaultByModle(PHTGL_ContractTrackProgress table)
+        {
+            var q = (from x in Funs.DB.PHTGL_ContractTrackProgress
+                    where
+                        (string.IsNullOrEmpty(table.ContractTrackProgressId) ||
+                         x.ContractTrackProgressId.Contains(table.ContractTrackProgressId)) &&
+                        (string.IsNullOrEmpty(table.ContractTrackId) ||
+                         x.ContractTrackId.Contains(table.ContractTrackId)) &&
+                        (string.IsNullOrEmpty(table.Date) ||
+                         x.Date.Contains(table.Date))
+                    orderby x.Date
+                    select x).FirstOrDefault()
+                ;
+            return q;
         }
-
         /// <summary>
         ///     获取分页列表
         /// </summary>
@@ -46,7 +58,7 @@ namespace BLL
             var q = GetPHTGL_ContractTrackProgressByModle(table);
             Count = q.Count();
             if (Count == 0) return null;
-            q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
+            q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize);
             // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
             return from x in q
                 select new