diff --git a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs index edef4a12..164c348c 100644 --- a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs @@ -1335,10 +1335,10 @@ namespace BLL /// 获取分部工程个数 /// /// - public static List GetSubProjectNum() + public static List GetSubProjectNum() { - var result = (from x in Funs.DB.WBS_DivisionProject - where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "1" && x.IsSelected == true + var result = (from x in Funs.DB.WBS_WorkPackage + where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "1" && x.IsApprove == true select x).ToList(); return result; } @@ -1347,7 +1347,7 @@ namespace BLL /// 获取分部工程个数(异步) /// /// - public static async Task> GetSubProjectNumAsync() + public static async Task> GetSubProjectNumAsync() { return await Task.Run(GetSubProjectNum); } @@ -1356,10 +1356,10 @@ namespace BLL /// 获取分项工程个数 /// /// - public static List GetSubdivisionalWorksNum() + public static List GetSubdivisionalWorksNum() { - var result = (from x in Funs.DB.WBS_DivisionProject - where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "3" && x.IsSelected == true + var result = (from x in Funs.DB.WBS_WorkPackage + where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "3" && x.IsApprove == true select x).ToList(); return result; } @@ -1368,7 +1368,7 @@ namespace BLL /// 获取分项工程个数(异步) /// /// - public static async Task> GetSubdivisionalWorksNumAsync() + public static async Task> GetSubdivisionalWorksNumAsync() { return await Task.Run(GetSubdivisionalWorksNum); }