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

运行日志调整提交

Browse Source
This commit is contained in:
汪青
2024-05-04 00:43:11 +08:00
parent 02ee4be036
commit 9a7c5aae14
6 changed files with 400 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/ProduceTestRun/RunningLogManagementList.aspx.cs
+18 -90
View File
@@ -24,82 +24,10 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
if (!IsPostBack)
{
//绑定数据
InitTreeMenu();
BindGrid();
}
}
#region 树绑定
/// <summary>
/// 加载树
/// </summary>
private void InitTreeMenu()
{
this.tvControlItem.Nodes.Clear();
TreeNode rootNode = new TreeNode();
rootNode.Text = "检查表";
rootNode.NodeID = "0";
rootNode.Expanded = true;
rootNode.ToolTip = "";
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
var alllist = Funs.DB.PreRun_SysDevice.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.PreRunLevel != 4).ToList();
if (alllist.Count() > 0)
{
var onelist = alllist.Where(x => x.PreRunLevel == 1).ToList();
foreach (var itemOne in onelist)
{
TreeNode rootOneNode = new TreeNode();
rootOneNode.NodeID = itemOne.PreRunId;
rootOneNode.Text = itemOne.PreRunName;
rootOneNode.ToolTip = itemOne.PreRunName;
rootOneNode.CommandName = "";
rootOneNode.EnableClickEvent = true;
rootOneNode.EnableExpandEvent = false;
rootNode.Nodes.Add(rootOneNode);
rootOneNode.Expanded = true;
var twolist = alllist.Where(x => x.PreRunLevel == 2 && x.ParentId == itemOne.PreRunId).ToList();
foreach (var itemTwo in twolist)
{
TreeNode rootTwoNode = new TreeNode();
rootTwoNode.NodeID = itemOne.PreRunId + "|" + itemTwo.PreRunId;
rootTwoNode.Text = itemTwo.PreRunName;
rootTwoNode.ToolTip = itemTwo.PreRunName;
rootTwoNode.CommandName = "";
rootTwoNode.EnableClickEvent = true;
rootTwoNode.EnableExpandEvent = false;
rootOneNode.Nodes.Add(rootTwoNode);
rootTwoNode.Expanded = true;
var threelist = alllist.Where(x => x.PreRunLevel == 3 && x.ParentId == itemTwo.PreRunId).ToList();
foreach (var itemThree in threelist)
{
TreeNode rootThreeNode = new TreeNode();
rootThreeNode.NodeID = itemOne.PreRunId + "|" + itemTwo.PreRunId + "|" + itemThree.PreRunId;
rootThreeNode.Text = itemThree.PreRunName;
rootThreeNode.ToolTip = itemThree.PreRunName;
rootThreeNode.CommandName = "";
rootThreeNode.EnableClickEvent = true;
rootThreeNode.EnableExpandEvent = false;
rootTwoNode.Nodes.Add(rootThreeNode);
rootThreeNode.Expanded = true;
}
}
}
}
}
/// <summary>
/// 点击TreeView
/// </summary>
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
this.BindGrid();
}
#endregion
#region 绑定数据
/// <summary>
@@ -107,42 +35,42 @@ namespace FineUIPro.Web.TestRun.ProduceTestRun
/// </summary>
public void BindGrid()
{
var years = DateTime.Now.Year;
string strSql = @"select a.RunningId,a.ProjectId,project.ProjectName as ProjectName,a.InstallationId,a.ProcessesId,a.SystemId,inst.PreRunName as InstallationName,proce.PreRunName as ProcessesName,syst.PreRunName as SystemName,a.JobNo,a.ShiftType,(case a.ShiftType when 1 then '白班' else '夜班' end) as ShiftTypeName,a.ShiftUser,shiftuser.UserName as ShiftUserName,a.SuccessionUser,successuser.UserName as SuccessionUserName,a.StartData,a.EndData,a.AddUser,a.AddTime,a.Sort from Running_LogManagement as a inner join Sys_User as shiftuser on shiftuser.UserId=a.ShiftUser inner join Sys_User as successuser on successuser.UserId=a.SuccessionUser inner join Base_Project as project on project.ProjectId=a.ProjectId inner join PreRun_SysDevice as inst on inst.PreRunId=a.InstallationId inner join PreRun_SysDevice as proce on proce.PreRunId=a.ProcessesId inner join PreRun_SysDevice as syst on syst.PreRunId=a.SystemId where a.ProjectId=@ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 0)
if (!string.IsNullOrWhiteSpace(txtStartData.Text))
{
var installationId = this.tvControlItem.SelectedNodeID.Split('|').First();
if (installationId != "0" && !string.IsNullOrWhiteSpace(installationId))
{
strSql += " and a.InstallationId=@InstallationId";
listStr.Add(new SqlParameter("@InstallationId", installationId));
}
strSql += " and a.StartData>=@StartData";
listStr.Add(new SqlParameter("@StartData", DateTime.Parse(txtStartData.Text).ToString("yyyy-MM-dd") + " 00:00:00"));
years = DateTime.Parse(txtStartData.Text).Year;
}
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 1)
if (!string.IsNullOrWhiteSpace(txtEndData.Text))
{
var processesId = this.tvControlItem.SelectedNodeID.Split('|')[1];
strSql += " and a.ProcessesId=@ProcessesId";
listStr.Add(new SqlParameter("@ProcessesId", processesId));
}
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
{
var systemId = this.tvControlItem.SelectedNodeID.Split('|').Last();
strSql += " and a.SystemId=@SystemId";
listStr.Add(new SqlParameter("@SystemId", systemId));
strSql += " and a.EndData<=@EndData";
listStr.Add(new SqlParameter("@EndData", DateTime.Parse(txtEndData.Text).ToString("yyyy-MM-dd") + " 23:59:59"));
}
if (!string.IsNullOrWhiteSpace(ddlShiftType.SelectedValue))
{
strSql += " and a.ShiftType=@ShiftType";
listStr.Add(new SqlParameter("@ShiftType", ddlShiftType.SelectedValue));
}
strSql += " order by a.AddTime asc";
strSql += " order by inst.PreRunLevel,inst.Sort,proce.Sort,syst.Sort asc";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
if (Funs.DB.Running_LogManagement.Count(x => x.StartData.Value.Year == years) > 0)
{
var minTime = Funs.DB.Running_LogManagement.Where(x => x.StartData.Value.Year == years).Min(m => m.StartData);
lblminTime.Text = $"{years}年日志最小日期：{minTime.Value.ToString("yyyy-MM-dd")}";
}
else
{
lblminTime.Text = $"{years}年无日志信息";
}
}
/// <summary>