lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
毕文静 2025-03-07 18:50:26 +08:00
parent e4fdb97d07 579525b168
commit 0845150840
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19647,7 +19647,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

12
SGGL/FineUIPro.Web/common/main_new.aspx.cs
View File

@ -1004,17 +1004,19 @@ namespace FineUIPro.Web.common
var list = new List<Model.Base_Project>(); var list = new List<Model.Base_Project>();
if (pids == null) if (pids == null)
{ {
list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList(); list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
} }
else else
{ {
list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId) && x.Progress != null).ToList(); list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList();
} }
if (list.Count > 0) if (list.Count > 0)
{ {
var progressCompletions = from x in Funs.DB.JDGL_ProgressCompletion select x;
foreach (var item in list) foreach (var item in list)
{ {
ProjectJd += "'" + item.Progress.Value.ToString("0.##") + "',"; var pCs = progressCompletions.Where(x => x.ProjectId == item.ProjectId).ToList();
ProjectJd += "'" + pCs.Sum(x => x.RealNum ?? 0).ToString("0.##") + "',";
ProjectMc += "'" + item.ShortName + "',"; ProjectMc += "'" + item.ShortName + "',";
} }
ProjectJd = ProjectJd.TrimEnd(','); ProjectJd = ProjectJd.TrimEnd(',');
@ -1092,11 +1094,11 @@ namespace FineUIPro.Web.common
var list = new List<Model.Base_Project>(); var list = new List<Model.Base_Project>();
if (pids == null) if (pids == null)
{ {
list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList(); list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
} }
else else
{ {
list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId) && x.Progress != null).ToList(); list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList();
} }
var PipelinList = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M"); var PipelinList = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M");
var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备"); var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备");