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

1

This commit is contained in:
高飞 2025-10-31 19:59:41 +08:00
parent 640ccf7b29
commit b120986fdc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
View File

@ -1335,10 +1335,10 @@ namespace BLL
/// 获取分部工程个数
/// </summary>
/// <returns></returns>
public static List<WBS_DivisionProject> GetSubProjectNum()
public static List<WBS_WorkPackage> 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
/// 获取分部工程个数(异步)
/// </summary>
/// <returns></returns>
public static async Task<List<WBS_DivisionProject>> GetSubProjectNumAsync()
public static async Task<List<WBS_WorkPackage>> GetSubProjectNumAsync()
{
return await Task.Run(GetSubProjectNum);
}
@ -1356,10 +1356,10 @@ namespace BLL
/// 获取分项工程个数
/// </summary>
/// <returns></returns>
public static List<WBS_DivisionProject> GetSubdivisionalWorksNum()
public static List<WBS_WorkPackage> 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
/// 获取分项工程个数(异步)
/// </summary>
/// <returns></returns>
public static async Task<List<WBS_DivisionProject>> GetSubdivisionalWorksNumAsync()
public static async Task<List<WBS_WorkPackage>> GetSubdivisionalWorksNumAsync()
{
return await Task.Run(GetSubdivisionalWorksNum);
}

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -16839,7 +16839,7 @@
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">