lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
高飞
2025-11-12 10:27:22 +08:00
parent dc2ad822cd
commit 29c074c622
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs
+5 -4
View File
@@ -45,7 +45,9 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static IEnumerable getListData(string projectId, string startTime, string endTime, Grid Grid1) public static IEnumerable getListData(string projectId, string startTime, string endTime, Grid Grid1)
{ {
IQueryable<Model.Check_ProjectLeaderCheck> getDataList = getDataLists; Model.SGGLDB db = Funs.DB;
IQueryable<Model.Check_ProjectLeaderCheck> getDataList = from x in db.Check_ProjectLeaderCheck
select x;
if (!string.IsNullOrEmpty(projectId)) if (!string.IsNullOrEmpty(projectId))
{ {
getDataList = getDataList.Where(x => x.ProjectId == projectId); getDataList = getDataList.Where(x => x.ProjectId == projectId);
@@ -72,16 +74,15 @@ namespace BLL
return null; return null;
} }
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
var db1 = Funs.DB;
return from x in getDataList return from x in getDataList
join y in db1.Base_Project on x.ProjectId equals y.ProjectId join y in db.Base_Project on x.ProjectId equals y.ProjectId
into ps into ps
from y in ps.DefaultIfEmpty() from y in ps.DefaultIfEmpty()
select new select new
{ {
x.ProjectLeaderCheckId, x.ProjectLeaderCheckId,
x.ProjectId, x.ProjectId,
db1.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName, db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
x.CheckCode, x.CheckCode,
x.UnitIds, x.UnitIds,
x.LeaderIds, x.LeaderIds,