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-01-30 16:03:56 +08:00
parent 77f19c4965 183af3a610
commit b3d60a2ee0
13 changed files with 525 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
+20 -7
View File
@@ -5,12 +5,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAnalyse,divCheck" />
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAnalyse,divCheck" />
<f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
<Regions>
@@ -22,7 +22,7 @@
<f:FormRow>
<Items>
<f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px"></f:DatePicker>
<f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px"></f:DatePicker>
<f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
@@ -40,6 +40,8 @@
</f:CheckBox>--%>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
</Items>
</f:FormRow>
</Rows>
@@ -62,11 +64,22 @@
</f:ContentPanel>
</Items>
<Items>
<f:Tree ID="Tree1" IsFluid="true" ShowHeader="true" EnableCollapse="false"
Title="System" runat="server" Width="400px" CssStyle="width:200px; height:600px">
<Items>
<%-- <f:Tree ID="Tree1" IsFluid="true" ShowHeader="true" EnableCollapse="false"
Title="System" runat="server" Width="400px" CssStyle="width:200px; height:600px"
OnNodeCommand="tvControlItem_NodeCommand"
AutoLeafIdentification="true">
</f:Tree>--%>
<%--<f:Tree ID="Tree1" IsFluid="true" EnableCollapse="false" ShowHeader="false"
OnNodeCommand="tvControlItem_NodeCommand" CssStyle="width:200px; height:600px"
runat="server">
</f:Tree>--%>
<f:Tree ID="trRectify" Width="200px" EnableCollapse="true" ShowHeader="true"
CssStyle="width:200px; height:600px"
OnNodeCommand="trRectify_NodeCommand" AutoLeafIdentification="true" runat="server">
</f:Tree>
</Items>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
+191 -77
View File
@@ -52,6 +52,12 @@ namespace FineUIPro.Web.Transfer.Chart
/// </summary>
private void AnalyseData()
{
if (string.IsNullOrEmpty(ProjectId))
{
Alert.ShowInTop("项目未获取到，请刷新页面。", MessageBoxIcon.Warning);
return;
}
var sTime = DateTime.Now.AddDays(-7);
var eTime = DateTime.Now; ;
@@ -64,8 +70,9 @@ namespace FineUIPro.Web.Transfer.Chart
}
//查询当前日期中的system的具体数目，去除重复
var list = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
&& x.Test_Package_FINISH >= sTime && x.Test_Package_FINISH <= eTime).ToList();
var list = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
&& x.FDate >= sTime && x.FDate <= eTime).ToList();
var SystemList = (from x in list select x.SystemName).Distinct();
//先加载左侧system 树菜单
@@ -87,39 +94,63 @@ namespace FineUIPro.Web.Transfer.Chart
Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i); ;
//根据日期查询当前system的数量
var systemListbyDate = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
&& x.Test_Package_FINISH >= Convert.ToDateTime(rowTime["日期"])
&& x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
&& x.FDate >= Convert.ToDateTime(rowTime["日期"])
&& x.FDate < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
//具体的system 去重
var systemList = (from x in systemListbyDate select x.SystemName).Distinct();
if (systemList.ToList().Count>0)
//查询TestPackage 去重
var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
if (testpackageList.ToList().Count>0)
{
systemBol = true;
}
foreach (var item in systemList)
foreach (var item in testpackageList)
{
//查询当前日期每个system的数量
var systemSumCount = systemListbyDate.Where(x => x.SystemName == item).ToList().Count;
//查询当前日期每个testpackage的数量
var systemSumCount = systemListbyDate.Where(x => x.TestPackage == item).ToList().Count;
//子系统中完成的数量
var subSystemSumCount = systemListbyDate.Where(x => x.SystemName == item &&
x.FINAL_Status.ToLower() == "finished").ToList().Count;
var subSystemSumCount = systemListbyDate.Where(x => x.TestPackage == item &&
x.Status.ToLower() == "finished").ToList().Count;
//子系统中没完成的情况
var subSystemSumNotStartCount = systemListbyDate.Where(x => x.SystemName == item &&
x.FINAL_Status.ToLower() == "not start").ToList().Count;
var subSystemSumNotStartCount = systemListbyDate.Where(x => x.TestPackage == item &&
(x.Status.ToLower() == "not start"|| x.Status=="" || x.Status==null )).ToList().Count;
//如果总数量等于完成的数量，完成量+1
if (systemSumCount == subSystemSumCount)
{
finishedCount += 1;
//如果都是完成，需要最后 12表 test packge 必须是Finished才能是完成
var punchlistFromList= Funs.DB.Transfer_PunchlistFrom.Where(x=>x.ProjectId==ProjectId
&& x.Test_Package==item
&& x.PUNCH_ITEM_FINISH_DATE>= Convert.ToDateTime(rowTime["日期"])
&& x.PUNCH_ITEM_FINISH_DATE < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
//如果查到
if (punchlistFromList.Count > 0)
{
//12表当前日期完成的数量
var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
//如果完成的数量等于总得数量，则是完成
if (punchlistFromFinshCount == punchlistFromList.Count)
{
finishedCount += 1;
}
else {
inProgress += 1;
}
}
else {
inProgress += 1;
}
}
//如果总数量等于not start，未开始量+1
else if (systemSumCount== subSystemSumNotStartCount)
{
notStart += 1;
}
else {
inProgress += 1;
}
}
rowTime["Finished"] = finishedCount;
@@ -130,7 +161,7 @@ namespace FineUIPro.Web.Transfer.Chart
}
if (systemBol)
{
this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "Instrumentation PROGRESS", this.drpChartType.SelectedValue, 1100, 600, false));
this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
}
@@ -161,75 +192,158 @@ namespace FineUIPro.Web.Transfer.Chart
private void LoadData(IEnumerable<String> list)
{
Tree1.Nodes.Clear();
// 模拟从数据库返回数据表
DataTable table = CreateDataTable(list);
DataSet ds = new DataSet();
ds.Tables.Add(table);
ds.Relations.Add("TreeRelation", ds.Tables[0].Columns["Id"], ds.Tables[0].Columns["ParentId"]);
foreach (DataRow row in ds.Tables[0].Rows)
this.trRectify.Nodes.Clear();
this.trRectify.ShowBorder = false;
this.trRectify.ShowHeader = false;
this.trRectify.EnableIcons = true;
this.trRectify.AutoScroll = true;
this.trRectify.EnableSingleClickExpand = true;
TreeNode rootNode = new TreeNode
{
if (row.IsNull("ParentId"))
{
TreeNode node = new TreeNode();
node.Text = row["Text"].ToString();
Tree1.Nodes.Add(node);
ResolveSubTree(row, node);
}
}
Text = "全部",
NodeID = "ALL",
EnableClickEvent = true,
Expanded = true
};
this.trRectify.Nodes.Add(rootNode);
BoundTree(rootNode.Nodes, list);
}
private void ResolveSubTree(DataRow dataRow, TreeNode treeNode)
/// <summary>
/// 加载树
/// </summary>
/// <param name="nodes"></param>
/// <param name="menuId"></param>
private void BoundTree(TreeNodeCollection nodes, IEnumerable<String> list)
{
DataRow[] rows = dataRow.GetChildRows("TreeRelation");
if (rows.Length > 0)
{
// 如果是目录，则默认展开
treeNode.Expanded = true;
foreach (DataRow row in rows)
{
TreeNode node = new TreeNode();
node.Text = row["Text"].ToString();
treeNode.Nodes.Add(node);
ResolveSubTree(row, node);
}
}
}
#region CreateDataTable
private DataTable CreateDataTable(IEnumerable<String> list)
{
DataTable table = new DataTable();
DataColumn column1 = new DataColumn("Id", typeof(string));
DataColumn column2 = new DataColumn("Text", typeof(String));
DataColumn column3 = new DataColumn("ParentId", typeof(string));
table.Columns.Add(column1);
table.Columns.Add(column2);
table.Columns.Add(column3);
DataRow row = table.NewRow();
row[0] = "ALL";
row[1] = "全部";
row[2] = DBNull.Value;
table.Rows.Add(row);
TreeNode tn = null;
foreach (var item in list)
{
row = table.NewRow();
row[0] = item.ToString();
row[1] = item.ToString();
row[2] = "ALL";
table.Rows.Add(row);
tn = new TreeNode
{
Text = item.ToString(),
NodeID = item.ToString(),
EnableClickEvent = true
};
nodes.Add(tn);
}
return table;
}
#region 点击树节点
protected void trRectify_NodeCommand(object sender, TreeCommandEventArgs e) {
var SystemName = this.trRectify.SelectedNodeID;
if (SystemName == "ALL")
{
AnalyseData();
}
else
{
var sTime = DateTime.Now.AddDays(-7);
var eTime = DateTime.Now; ;
//如果没有填写日期，则是七天内的
if (!string.IsNullOrEmpty(txtStarTime.Text) && !string.IsNullOrEmpty(txtEndTime.Text))
{
sTime = Convert.ToDateTime(txtStarTime.Text);
eTime = Convert.ToDateTime(txtEndTime.Text);
}
DataTable dtTime = new DataTable();
dtTime.Columns.Add("日期", typeof(string));
dtTime.Columns.Add("Finished", typeof(string));
dtTime.Columns.Add("In Progress", typeof(string));
dtTime.Columns.Add("Not Start", typeof(string));
var systemBol = false;
for (var i = sTime; i <= eTime; i = i.AddDays(1))
{
var finishedCount = 0;
var inProgress = 0;
var notStart = 0;
DataRow rowTime = dtTime.NewRow();
Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i); ;
//根据日期查询当前system的数量
var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId && x.SystemName == SystemName
&& x.FDate >= Convert.ToDateTime(rowTime["日期"])
&& x.FDate < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
//查询TestPackage 去重
var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
if (testpackageList.ToList().Count > 0)
{
systemBol = true;
}
foreach (var item in testpackageList)
{
//查询当前日期每个testpackage的数量
var systemSumCount = systemListbyDate.Where(x => x.TestPackage == item).ToList().Count;
//子系统中完成的数量
var subSystemSumCount = systemListbyDate.Where(x => x.TestPackage == item &&
x.Status.ToLower() == "finished").ToList().Count;
//子系统中没完成的情况
var subSystemSumNotStartCount = systemListbyDate.Where(x => x.TestPackage == item &&
(x.Status.ToLower() == "not start" || x.Status == "" || x.Status == null)).ToList().Count;
//如果总数量等于完成的数量，完成量+1
if (systemSumCount == subSystemSumCount)
{
//如果都是完成，需要最后 12表 test packge 必须是Finished才能是完成
var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
&& x.SystemName==SystemName
&& x.Test_Package == item
&& x.PUNCH_ITEM_FINISH_DATE >= Convert.ToDateTime(rowTime["日期"])
&& x.PUNCH_ITEM_FINISH_DATE < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
//如果查到
if (punchlistFromList.Count > 0)
{
//12表当前日期完成的数量
var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
//如果完成的数量等于总得数量，则是完成
if (punchlistFromFinshCount == punchlistFromList.Count)
{
finishedCount += 1;
}
else
{
inProgress += 1;
}
}
else
{
inProgress += 1;
}
}
//如果总数量等于not start，未开始量+1
else if (systemSumCount == subSystemSumNotStartCount)
{
notStart += 1;
}
else
{
inProgress += 1;
}
}
rowTime["Finished"] = finishedCount;
rowTime["In Progress"] = inProgress;
rowTime["Not Start"] = notStart;
dtTime.Rows.Add(rowTime);
}
if (systemBol)
{
this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "SYSTEM PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
}
}
}
#endregion
}
}
SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
Generated
+2 -2
View File
@@ -141,12 +141,12 @@ namespace FineUIPro.Web.Transfer.Chart
protected global::Web.Controls.ChartControl ChartUc;
/// <summary>
/// Tree1 控件。
/// trRectify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree Tree1;
protected global::FineUIPro.Tree trRectify;
}
}