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

提交试车修改

Browse Source
This commit is contained in:
高飞
2023-08-04 11:19:37 +08:00
parent bc7fb516ec
commit f129533d18
18 changed files with 197 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx.cs
+37 -17
View File
@@ -21,6 +21,10 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// <summary>
/// 子系统主键
/// </summary>
public string SystemId { get { return (string)ViewState["SystemId"]; } set { ViewState["SystemId"] = value; } }
/// <summary>
/// 子系统主键
/// </summary>
public string SsubSystemId { get { return (string)ViewState["SsubSystemId"]; } set { ViewState["SsubSystemId"] = value; } }
protected void Page_Load(object sender, EventArgs e)
@@ -47,7 +51,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
var allPreRunLs = Funs.DB.PreRun_SysDevice.Where(p => p.ProjectId == this.CurrUser.LoginProjectId).ToList();
var onePreRunLs = allPreRunLs.Where(p => p.PreRunLevel == 1);
var onePreRunLs = allPreRunLs.Where(p => p.PreRunLevel == 1).OrderBy(x => x.Sort);
foreach (var item in onePreRunLs)
{
TreeNode rootUnitNode = new TreeNode();//定义根节点
@@ -70,7 +74,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
private void BindNodes(TreeNode node, List<PreRun_SysDevice> list, string parentId)
{
var itemList = list.Where(p => p.ParentId == parentId).ToList();
var itemList = list.Where(p => p.ParentId == parentId).OrderBy(x => x.Sort).ToList();
if (itemList.Count > 0)
{
foreach (var item in itemList)
@@ -152,7 +156,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
lblszxtmc.Text = list.FirstOrDefault(p => p.PreRunLevel == 4).PreRunName;
lblszxtbm.Text = list.FirstOrDefault(p => p.PreRunLevel == 4).PreRunCode;
this.SsubSystemId = list.FirstOrDefault(p => p.PreRunLevel == 4).PreRunId;
var workPackages = Funs.DB.PreRun_SubSysWorkPackage.Where(p => p.SubSystemId == this.SsubSystemId).ToList();
this.SystemId = list.FirstOrDefault(p => p.PreRunLevel == 4).ParentId;
var workPackages = Funs.DB.PreRun_SubSysWorkPackage.Where(p => p.SubSystemId == this.SsubSystemId).OrderBy(x => x.Sort).ToList();
if (workPackages.Count > 0)
{
var workIds = workPackages.ConvertAll(p => p.WorkPackId);
@@ -163,6 +168,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
Grid1.DataSource = null;
Grid1.DataBind();
drpWorkPack.Values = null;
}
}
}
@@ -193,6 +199,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var workId = Grid1.DataKeys[i][0].ToString();
var model = new PreRun_SubSysWorkPackage();
model.SubSysId = Guid.NewGuid().ToString();
model.SystemId = prerunModel.ParentId;
model.SubSystemId = prerunModel.PreRunId;
model.WorkPackId = workId;
model.WorkPackCode = !string.IsNullOrWhiteSpace(values.Value<string>("WorkPackCode")) ? values.Value<string>("WorkPackCode") : "WP";
@@ -224,32 +231,44 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
if (!string.IsNullOrWhiteSpace(this.SsubSystemId))
{
var result = new List<WorkData>();
var data = from a in Funs.DB.PreRun_WorkPackage.Where(p => workPackIds.Contains(p.WorkPackId))
join b in Funs.DB.PreRun_SubSysWorkPackage.Where(p => p.SubSystemId == this.SsubSystemId) on a.WorkPackId equals b.WorkPackId into bb
from t in bb.DefaultIfEmpty()
select new WorkData()
{
WorkPackId = a.WorkPackId,
WorkPackCode = a.WorkPackCode,
WorkPackCode = t.WorkPackCode,
WorkPackName = a.WorkPackName,
SystemId = t.SystemId,
Sort = a.Sort,
Remark = t.Remark
};
//var list = data.ToList();
//if (list.Count > 0)
//{
// int i = 1;
// list.ForEach(a =>
// {
// var num = Funs.DB.SubSys_WorkPackage.Count(p => p.SubSystemId == this.SsubSystemId) + i;
// a.WorkPackCode = string.Format("WP{0}", string.Format("{0:d2}", num));
// i++;
// });
//}
if (data.Count() > 0)
{
var list = data.OrderBy(p => p.Sort).ToList();
Grid1.DataSource = list;
int i = 1;
foreach (var item in data.OrderBy(p => p.Sort))
{
var model = new WorkData();
model.WorkPackId = item.WorkPackId;
model.WorkPackName = item.WorkPackName;
model.SystemId = item.SystemId;
if (string.IsNullOrWhiteSpace(item.WorkPackCode))
{
var num = Funs.DB.PreRun_SubSysWorkPackage.Count(p => p.SystemId == this.SystemId) + i;
model.WorkPackCode = $"WP{string.Format("{0:d3}", num)}";
i++;
}
else
{
model.WorkPackCode = item.WorkPackCode;
}
model.Sort = item.Sort;
model.Remark = item.Remark;
result.Add(model);
}
result = result.OrderBy(p => p.Sort).ToList();
Grid1.DataSource = result;
Grid1.DataBind();
}
else
@@ -302,6 +321,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public class WorkData
{
public string SystemId { get; set; }
public string WorkPackId { get; set; }
public string WorkPackName { get; set; }
public int? Sort { get; set; }