1

2025-03-09 22:20:21 +08:00
parent 47631bb84d
commit 23f7bfbb1d
3 changed files with 199 additions and 23 deletions
@@ -455,17 +455,96 @@ namespace BLL
        }
        public static List<Model.View_HJGL_WeldJoint> GetViewWeldJointsBymodel(Model.View_HJGL_WeldJoint model)
        {
-            var q = (from x in Funs.DB.View_HJGL_WeldJoint
-                     where
-                            (string.IsNullOrEmpty(model.ProjectId) || x.ProjectId.Contains(model.ProjectId))
-                        && (string.IsNullOrEmpty(model.UnitWorkId) || x.UnitWorkId.Contains(model.UnitWorkId))
-                        && (string.IsNullOrEmpty(model.PipelineId) || x.PipelineId.Contains(model.PipelineId))
-                        && (string.IsNullOrEmpty(model.PipelineCode) || x.PipelineCode.Contains(model.PipelineCode))
-                        && (string.IsNullOrEmpty(model.WeldJointCode) || x.WeldJointCode.Contains(model.WeldJointCode))
-                     orderby x.WeldJointCode
-                     select x).AsParallel().ToList();
-            return q;
+            var baseQuery = from x in Funs.DB.View_HJGL_WeldJoint select x;
+            if (!string.IsNullOrEmpty(model.ProjectId))
+                baseQuery = baseQuery.Where(x => x.ProjectId == model.ProjectId);
+            if (!string.IsNullOrEmpty(model.UnitWorkId))
+                baseQuery = baseQuery.Where(x => x.UnitWorkId == model.UnitWorkId);
+            if (!string.IsNullOrEmpty(model.PipelineId))
+                baseQuery = baseQuery.Where(x => x.PipelineId == model.PipelineId);
+            if (!string.IsNullOrEmpty(model.PipelineCode))
+                baseQuery = baseQuery.Where(x => x.PipelineCode.Contains(model.PipelineCode));
+            if (!string.IsNullOrEmpty(model.WeldJointCode))
+                baseQuery = baseQuery.Where(x => x.WeldJointCode.Contains(model.WeldJointCode));
+
+            return baseQuery.ToList();
        }
+        public static IEnumerable<Model.View_HJGL_WeldJoint> GetIEnumerableViewWeldJointsBymodel(Model.View_HJGL_WeldJoint model)
+        {
+            var baseQuery = from x in Funs.DB.View_HJGL_WeldJoint select x;
+            if (!string.IsNullOrEmpty(model.ProjectId))
+                baseQuery = baseQuery.Where(x => x.ProjectId == model.ProjectId);
+            if (!string.IsNullOrEmpty(model.UnitWorkId))
+                baseQuery = baseQuery.Where(x => x.UnitWorkId == model.UnitWorkId);
+            if (!string.IsNullOrEmpty(model.PipelineId))
+                baseQuery = baseQuery.Where(x => x.PipelineId == model.PipelineId);
+            if (!string.IsNullOrEmpty(model.PipelineCode))
+                baseQuery = baseQuery.Where(x => x.PipelineCode.Contains(model.PipelineCode));
+            if (!string.IsNullOrEmpty(model.WeldJointCode))
+                baseQuery = baseQuery.Where(x => x.WeldJointCode.Contains(model.WeldJointCode));
+
+            return baseQuery.ToList()   ;
+        }
+        public static (List<Model.View_HJGL_WeldJoint> Data, int Total)GetDataBymodel(Model.View_HJGL_WeldJoint model, int pageIndex = 0, int pageSize = 20)
+        {
+            // 阶段一：构建基础查询
+            var baseQuery = Funs.DB.View_HJGL_WeldJoint.AsQueryable();
+ 
+            // 阶段二：构建动态查询条件
+            if (!string.IsNullOrEmpty(model.ProjectId))
+                baseQuery = baseQuery.Where(x => x.ProjectId == model.ProjectId);
+            if (!string.IsNullOrEmpty(model.UnitWorkId))
+                baseQuery = baseQuery.Where(x => x.UnitWorkId == model.UnitWorkId);
+            if (!string.IsNullOrEmpty(model.PipelineId))
+                baseQuery = baseQuery.Where(x => x.PipelineId == model.PipelineId);
+            if (!string.IsNullOrEmpty(model.PipelineCode))
+                baseQuery = baseQuery.Where(x => x.PipelineCode .Contains(model.PipelineCode));
+            if (!string.IsNullOrEmpty(model.WeldJointCode))
+                baseQuery = baseQuery.Where(x => x.WeldJointCode.Contains(  model.WeldJointCode));
+      
+            // 阶段三：排序与分页控制（索引优化关键）
+            var orderedQuery = baseQuery.OrderBy(x => x.WeldJointCode);
+
+            // 阶段四：分页执行（数据库层面分页）
+            var pagedData = orderedQuery
+                .Skip((pageIndex ) * pageSize)
+                .Take(pageSize)
+                .ToList();
+
+            // 获取总记录数（延迟计数优化）
+            var totalCount = baseQuery.Count();
+
+            return (pagedData, totalCount);
+        }
+        public static List<Model.View_HJGL_WeldJoint> GetViewWeldJointsBymodel(Model.View_HJGL_WeldJoint model, int pageIndex = 0, int pageSize = 20)
+        {
+            // 阶段一：构建基础查询
+            var baseQuery = Funs.DB.View_HJGL_WeldJoint.AsQueryable();
+
+            // 阶段二：构建动态查询条件
+            if (!string.IsNullOrEmpty(model.ProjectId))
+                baseQuery = baseQuery.Where(x => x.ProjectId == model.ProjectId);
+            if (!string.IsNullOrEmpty(model.UnitWorkId))
+                baseQuery = baseQuery.Where(x => x.UnitWorkId == model.UnitWorkId);
+            if (!string.IsNullOrEmpty(model.PipelineId))
+                baseQuery = baseQuery.Where(x => x.PipelineId == model.PipelineId);
+            if (!string.IsNullOrEmpty(model.PipelineCode))
+                baseQuery = baseQuery.Where(x => x.PipelineCode.Contains(model.PipelineCode));
+            if (!string.IsNullOrEmpty(model.WeldJointCode))
+                baseQuery = baseQuery.Where(x => x.WeldJointCode.Contains(model.WeldJointCode));
+
+            // 阶段三：排序与分页控制（索引优化关键）
+            var orderedQuery = baseQuery.OrderBy(x => x.WeldJointCode);
+
+            // 阶段四：分页执行（数据库层面分页）
+            var pagedData = orderedQuery
+                .Skip((pageIndex) * pageSize)
+                .Take(pageSize)
+                .ToList(); 
+
+            return pagedData;
+        }
+
        /// <summary>
        /// 根据壁厚计算焊口达因
        /// </summary>