合并
This commit is contained in:
@@ -1335,10 +1335,10 @@ namespace BLL
|
|||||||
/// 获取分部工程个数
|
/// 获取分部工程个数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static List<WBS_DivisionProject> GetSubProjectNum()
|
public static List<WBS_WorkPackage> GetSubProjectNum()
|
||||||
{
|
{
|
||||||
var result = (from x in Funs.DB.WBS_DivisionProject
|
var result = (from x in Funs.DB.WBS_WorkPackage
|
||||||
where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "1" && x.IsSelected == true
|
where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "1" && x.IsApprove == true
|
||||||
select x).ToList();
|
select x).ToList();
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -1347,7 +1347,7 @@ namespace BLL
|
|||||||
/// 获取分部工程个数(异步)
|
/// 获取分部工程个数(异步)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task<List<WBS_DivisionProject>> GetSubProjectNumAsync()
|
public static async Task<List<WBS_WorkPackage>> GetSubProjectNumAsync()
|
||||||
{
|
{
|
||||||
return await Task.Run(GetSubProjectNum);
|
return await Task.Run(GetSubProjectNum);
|
||||||
}
|
}
|
||||||
@@ -1356,10 +1356,10 @@ namespace BLL
|
|||||||
/// 获取分项工程个数
|
/// 获取分项工程个数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static List<WBS_DivisionProject> GetSubdivisionalWorksNum()
|
public static List<WBS_WorkPackage> GetSubdivisionalWorksNum()
|
||||||
{
|
{
|
||||||
var result = (from x in Funs.DB.WBS_DivisionProject
|
var result = (from x in Funs.DB.WBS_WorkPackage
|
||||||
where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "3" && x.IsSelected == true
|
where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "3" && x.IsApprove == true
|
||||||
select x).ToList();
|
select x).ToList();
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -1368,7 +1368,7 @@ namespace BLL
|
|||||||
/// 获取分项工程个数(异步)
|
/// 获取分项工程个数(异步)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task<List<WBS_DivisionProject>> GetSubdivisionalWorksNumAsync()
|
public static async Task<List<WBS_WorkPackage>> GetSubdivisionalWorksNumAsync()
|
||||||
{
|
{
|
||||||
return await Task.Run(GetSubdivisionalWorksNum);
|
return await Task.Run(GetSubdivisionalWorksNum);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user