refactor: 优化查询逻辑和代码结构

- 合并多行查询条件，提升代码可读性 - 精简分页查询和关联数据查询的代码 - 确保查询性能的同时，保持功能一致性

refactor: 优化查询逻辑和代码结构
- 合并多行查询条件，提升代码可读性 - 精简分页查询和关联数据查询的代码 - 确保查询性能的同时，保持功能一致性
“wangming”
1 parent e97f24a6
Showing 2 changed files with 8 additions and 22 deletions
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs
@@ -3339,18 +3339,12 @@ namespace NCC.Extend.LqKdKdjlb
                     .WhereIF(!string.IsNullOrEmpty(input.SourceType), pxmx => pxmx.SourceType == input.SourceType);
  
                 // 2. 通过 EXISTS 子查询筛选关联字段（在分页前筛选，确保分页准确）
-                baseQuery = baseQuery
-                    .WhereIF(!string.IsNullOrEmpty(input.MemberName), pxmx =>
-                        SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Khmc != null && x.Khmc.Contains(input.MemberName)).Any())
-                    .WhereIF(!string.IsNullOrEmpty(input.MemberPhone), pxmx =>
-                        SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Sjh == input.MemberPhone).Any())
-                    .WhereIF(!string.IsNullOrEmpty(input.ItemType), pxmx =>
-                        SqlFunc.Subqueryable<LqXmzlEntity>().Where(x => x.Id == pxmx.Px && x.Fl4 == input.ItemType).Any());
+                baseQuery = baseQuery.WhereIF(!string.IsNullOrEmpty(input.MemberName), pxmx => SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Khmc != null && x.Khmc.Contains(input.MemberName)).Any())
+                    .WhereIF(!string.IsNullOrEmpty(input.MemberPhone), pxmx => SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == pxmx.MemberId && x.Sjh == input.MemberPhone).Any())
+                    .WhereIF(!string.IsNullOrEmpty(input.ItemType), pxmx => SqlFunc.Subqueryable<LqXmzlEntity>().Where(x => x.Id == pxmx.Px && x.Fl4 == input.ItemType).Any());
  
                 // 3. 先分页查询主表数据（查询实体类，提高性能）
-                var pagedData = await baseQuery
-                    .OrderBy(sidx + " " + sort)
-                    .ToPagedListAsync(input.currentPage, input.pageSize);
+                var pagedData = await baseQuery.OrderBy(sidx + " " + sort).ToPagedListAsync(input.currentPage, input.pageSize);
  
                 // 4. 批量查询关联数据
                 var itemIds = pagedData.list.Select(x => x.Id).ToList();
@@ -3362,10 +3356,7 @@ namespace NCC.Extend.LqKdKdjlb
                 var memberDict = new Dictionary<string, (string Name, string Phone)>();
                 if (memberIds.Any())
                 {
-                    var members = await _db.Queryable<LqKhxxEntity>()
-                        .Where(x => memberIds.Contains(x.Id))
-                        .Select(x => new { x.Id, x.Khmc, x.Sjh })
-                        .ToListAsync();
+                    var members = await _db.Queryable<LqKhxxEntity>().Where(x => memberIds.Contains(x.Id)).Select(x => new { x.Id, x.Khmc, x.Sjh }).ToListAsync();
                     memberDict = members.ToDictionary(x => x.Id, x => (x.Khmc ?? "", x.Sjh ?? ""));
                 }
  
@@ -3373,10 +3364,7 @@ namespace NCC.Extend.LqKdKdjlb
                 var activityDict = new Dictionary<string, string>();
                 if (activityIds.Any())
                 {
-                    var activities = await _db.Queryable<LqPackageInfoEntity>()
-                        .Where(x => activityIds.Contains(x.Id))
-                        .Select(x => new { x.Id, x.ActivityName })
-                        .ToListAsync();
+                    var activities = await _db.Queryable<LqPackageInfoEntity>().Where(x => activityIds.Contains(x.Id)).Select(x => new { x.Id, x.ActivityName }).ToListAsync();
                     activityDict = activities.ToDictionary(x => x.Id, x => x.ActivityName ?? "");
                 }
  
@@ -3384,10 +3372,7 @@ namespace NCC.Extend.LqKdKdjlb
                 var projectDict = new Dictionary<string, string>();
                 if (projectIds.Any())
                 {
-                    var projects = await _db.Queryable<LqXmzlEntity>()
-                        .Where(x => projectIds.Contains(x.Id))
-                        .Select(x => new { x.Id, x.Qt2 })
-                        .ToListAsync();
+                    var projects = await _db.Queryable<LqXmzlEntity>().Where(x => projectIds.Contains(x.Id)).Select(x => new { x.Id, x.Qt2 }).ToListAsync();
                     projectDict = projects.ToDictionary(x => x.Id, x => x.Qt2 ?? "");
                 }
  
@@ -817,6 +817,7 @@ namespace NCC.Extend.LqXmzl
         }
         #endregion
  
+
     }
     /// <summary>
     /// 品项统计数据（内部类）