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/SubInspectTerm.aspx.cs
+104 -14
View File
@@ -41,7 +41,7 @@ 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
select new { a.PreRunId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackCode, c.WorkPackName };
select new { a.PreRunId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName };
if (list.Count() > 0)
{
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
rootUnitNode.EnableExpandEvent = true;
rootNode.Nodes.Add(rootUnitNode);
rootUnitNode.Expanded = true;
var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackCode, x.WorkPackName }).ToList();
var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName }).ToList();
if (worklist.Count > 0)
{
foreach (var itemWork in worklist)
@@ -93,21 +93,42 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void BindGrid()
{
var result = new List<Brid_SubInspectTermItem>();
var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First();
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last();
//获取子系统
var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId);
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).ToList();
if (list.Count == 0)
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).OrderBy(x => x.Sort).ToList();
if (list.Count > 0)
{
list = new List<PreRun_SubInspectTermItem>();
var defaultDatas = Funs.DB.PreRun_WorkInspectTemplate.Where(s => s.WorkPackId == workPackId).ToList();
if (defaultDatas.Count > 0)
foreach (var item in list)
{
int index = 0;
foreach (var item in defaultDatas)
var model = new Brid_SubInspectTermItem();
model.SubItemId = item.SubItemId;
model.ProjectId = item.ProjectId;
model.WorkPackId = item.WorkPackId;
model.WorkInspectId = item.WorkInspectId;
model.WorkInspectName = item.WorkInspectName;
model.InstallationId = subSysModel.InstallationId;
model.ProcessesId = subSysModel.ProcessesId;
model.SystemId = subSysModel.SystemId;
model.SubSystemId = subSysModel.PreRunId;
model.InspectedUser = item.InspectedUser;
model.Sort = item.Sort;
model.isChick = true;
result.Add(model);
}
}
//获取预加载的数据
var defaultDatas = Funs.DB.PreRun_WorkInspectTemplate.Where(s => s.WorkPackId == workPackId).OrderBy(x => x.Sort).ToList();
if (defaultDatas.Count > 0)
{
int index = list.Count + 1;
foreach (var item in defaultDatas)
{
if (list.Count(x => x.WorkInspectName == item.WorkInspectName) == 0)
{
var model = new PreRun_SubInspectTermItem();
var model = new Brid_SubInspectTermItem();
model.SubItemId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.WorkPackId = item.WorkPackId;
@@ -118,14 +139,21 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model.SystemId = subSysModel.SystemId;
model.SubSystemId = subSysModel.PreRunId;
model.Sort = index + 1;
list.Add(model);
model.isChick = false;
result.Add(model);
index++;
}
}
}
Grid1.DataSource = list;
Grid1.DataSource = result;
Grid1.DataBind();
if(result.Count(x => x.isChick)>0)
{
//默认选中行
var checkids = result.Where(x => x.isChick).Select(a => a.SubItemId);
Grid1.SelectedRowIDArray = checkids.ToArray();
}
//检查人绑定
var userList = from user in Funs.DB.Sys_User join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId where projectrole.ProjectId == this.CurrUser.LoginProjectId select user;
@@ -141,8 +169,58 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlInspectedUser.DataValueField = "UserId";
ddlInspectedUser.DataSource = data;
ddlInspectedUser.DataBind();
//Funs.FineUIPleaseSelect(ddlInspectedUser);
#region 注释
//var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First();
//var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last();
////获取子系统
//var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId);
//var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).OrderBy(x => x.Sort).ToList();
//if (list.Count == 0)
//{
// list = new List<PreRun_SubInspectTermItem>();
// var defaultDatas = Funs.DB.PreRun_WorkInspectTemplate.Where(s => s.WorkPackId == workPackId).OrderBy(x=>x.Sort).ToList();
// if (defaultDatas.Count > 0)
// {
// int index = 0;
// foreach (var item in defaultDatas)
// {
// var model = new PreRun_SubInspectTermItem();
// model.SubItemId = Guid.NewGuid().ToString();
// model.ProjectId = this.CurrUser.LoginProjectId;
// model.WorkPackId = item.WorkPackId;
// model.WorkInspectId = item.WorkInspectId;
// model.WorkInspectName = item.WorkInspectName;
// model.InstallationId = subSysModel.InstallationId;
// model.ProcessesId = subSysModel.ProcessesId;
// model.SystemId = subSysModel.SystemId;
// model.SubSystemId = subSysModel.PreRunId;
// model.Sort = index + 1;
// list.Add(model);
// index++;
// }
// }
//}
//Grid1.DataSource = list;
//Grid1.DataBind();
////检查人绑定
//var userList = from user in Funs.DB.Sys_User join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId where projectrole.ProjectId == this.CurrUser.LoginProjectId select user;
//var userids = new List<string>() { Const.sysglyId, Const.hfnbdId, Const.sedinId };
//var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId));
//var data = userList.ToList();
//if (addUserList.Count() > 0)
//{
// data.AddRange(addUserList);
//}
//DropDownList ddlInspectedUser = Grid1.FindColumn("InspectedUser").FindControl("ddlInspectedUser") as DropDownList;
//ddlInspectedUser.DataTextField = "UserName";
//ddlInspectedUser.DataValueField = "UserId";
//ddlInspectedUser.DataSource = data;
//ddlInspectedUser.DataBind();
#endregion
}
/// <summary>
@@ -363,5 +441,17 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
return result;
}
/// <summary>
/// 绑定实体
/// </summary>
public class Brid_SubInspectTermItem : PreRun_SubInspectTermItem
{
/// <summary>
/// 是否选中
/// </summary>
public bool isChick { get; set; }
}
}
}