zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/JDGL/WBS/WBSSet.aspx.cs
+5 -5
View File
@@ -104,7 +104,7 @@ namespace FineUIPro.Web.JDGL.WBS
e.Node.Nodes.Clear();
if (e.Node.CommandName == "cnProfession") //展开专业节点
{
var unitProjects = from x in Funs.DB.Wbs_UnitProjectInit where x.CnProfessionId == Convert.ToInt32(e.Node.NodeID) && x.SuperUnitProject == null orderby x.UnitProjectCode select x;
var unitProjects = from x in Funs.DB.Wbs_UnitProjectInit where x.CnProfessionId == Convert.ToInt32(e.Node.NodeID) && x.SuperUnitProject == null orderby x.SortIndex select x;
foreach (var unitProject in unitProjects)
{
TreeNode newNode = new TreeNode();
@@ -142,7 +142,7 @@ namespace FineUIPro.Web.JDGL.WBS
}
else //不存在子单位工程，加载分部工程
{
var wbsSet1s = from x in Funs.DB.WBS_WbsSetInit where x.Flag == 1 && x.UnitProjectCode == e.Node.NodeID orderby x.WbsSetCode select x;
var wbsSet1s = from x in Funs.DB.WBS_WbsSetInit where x.UnitProjectCode == e.Node.NodeID && x.SuperWbsSetCode == null orderby x.WbsSetCode select x;
if (wbsSet1s.Count() > 0)
{
foreach (var wbsSet1 in wbsSet1s)
@@ -162,7 +162,7 @@ namespace FineUIPro.Web.JDGL.WBS
}
else
{
var wbsSet3s = from x in Funs.DB.WBS_WbsSetInit where x.Flag == 3 && x.UnitProjectCode == e.Node.NodeID orderby x.WbsSetCode select x;
var wbsSet3s = from x in Funs.DB.WBS_WbsSetInit where x.UnitProjectCode == e.Node.NodeID && x.SuperWbsSetCode == null orderby x.WbsSetCode select x;
if (wbsSet3s.Count() > 0)
{
foreach (var wbsSet3 in wbsSet3s)
@@ -186,7 +186,7 @@ namespace FineUIPro.Web.JDGL.WBS
}
else
{
var wbsSet4s = from x in Funs.DB.WBS_WbsSetInit where x.Flag == 4 && x.UnitProjectCode == e.Node.NodeID orderby x.WbsSetCode select x;
var wbsSet4s = from x in Funs.DB.WBS_WbsSetInit where x.UnitProjectCode == e.Node.NodeID && x.SuperWbsSetCode == null orderby x.WbsSetCode select x;
if (wbsSet4s.Count() > 0)
{
foreach (var wbsSet4 in wbsSet4s)
@@ -206,7 +206,7 @@ namespace FineUIPro.Web.JDGL.WBS
}
else if (e.Node.CommandName == "childUnitProject") //展开子单位工程节点
{
var wbsSet1s = from x in Funs.DB.WBS_WbsSetInit where x.Flag == 1 && x.UnitProjectCode == e.Node.NodeID orderby x.WbsSetCode select x;
var wbsSet1s = from x in Funs.DB.WBS_WbsSetInit where x.UnitProjectCode == e.Node.NodeID && x.SuperWbsSetCode == null orderby x.WbsSetCode select x;
foreach (var wbsSet1 in wbsSet1s)
{
TreeNode newNode = new TreeNode();