提交代码

This commit is contained in:
2024-01-05 09:40:50 +08:00
parent 97015c50ec
commit ba149177c6
65 changed files with 9695 additions and 244 deletions
@@ -43,8 +43,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
join b in Funs.DB.PreRun_SubSysWorkPackage on a.PreRunId equals b.SubSystemId
join c in Funs.DB.PreRun_WorkPackage on b.WorkPackId equals c.WorkPackId
where a.ProjectId == this.CurrUser.LoginProjectId
orderby a.Sort, a.PreRunLevel ascending
select new { a.PreRunId, a.SystemId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName, b.WorkPackCode };
orderby a.Sort, a.PreRunLevel
select new { a.PreRunId, a.SystemId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName, b.WorkPackCode, a.Sort };
if (list.Count() > 0)
{
@@ -64,8 +64,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
rootFirstNode.EnableExpandEvent = false;
rootNode.Nodes.Add(rootFirstNode);
rootFirstNode.Expanded = true;
var subList = list.Where(g => g.SystemId == itemSys.PreRunId).GroupBy(x => new { x.PreRunId, x.SystemId, x.PreRunCode, x.PreRunName });
foreach (var item in subList)
var subList = list.Where(g => g.SystemId == itemSys.PreRunId).GroupBy(x => new { x.PreRunId, x.SystemId, x.PreRunCode, x.PreRunName, x.Sort });
foreach (var item in subList.OrderBy(o => o.Key.Sort))
{
TreeNode rootUnitNode = new TreeNode();//定义根节点
rootUnitNode.NodeID = item.Key.PreRunId;
@@ -827,7 +827,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
else
{
ddbSysPiping.Values = null;
ddbSysPiping.Values = null;
ddbSysPiping.Texts = null;
cbSysPiping.Items.Clear();
cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", ""));