diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs index f3e0c40a..af38dc5f 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs @@ -28,13 +28,13 @@ namespace FineUIPro.Web.Transfer.Chart { var systemCode = Funs.DB.Transfer_LHCSystemList .Where(x => x.ProjectId == CurrUser.LoginProjectId) - .GroupBy(p => new { p.Commissioningsystemcode }) - .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList(); + .GroupBy(p => new { p.SubCommissioningsystem }) + .Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList(); int indexRow = 1; ddlSubSysNo.Items.Insert(0, new FineUIPro.ListItem("ALL", "")); foreach (var t in systemCode) { - ddlSubSysNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode)); + ddlSubSysNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SubCommissioningsystem, t.SubCommissioningsystem)); indexRow++; } @@ -86,7 +86,7 @@ else CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0))) end ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark from( -SELECT Commissioningsystemcode as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by Commissioningsystemcode,ProjectId +SELECT SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by SubCommissioningsystem,ProjectId ) f left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo --piping diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs index 8bca2f21..479c5b07 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs @@ -16,13 +16,13 @@ namespace FineUIPro.Web.Transfer.Chart if (!IsPostBack) { var systemCode = Funs.DB.Transfer_LHCSystemList .Where(x => x.ProjectId == CurrUser.LoginProjectId) - .GroupBy(p => new { p.Commissioningsystemcode }) - .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList(); + .GroupBy(p => new { p.SubCommissioningsystem }) + .Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList(); int indexRow = 1; ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", "")); foreach (var t in systemCode) { - ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode)); + ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SubCommissioningsystem, t.SubCommissioningsystem)); indexRow++; } @@ -40,15 +40,15 @@ namespace FineUIPro.Web.Transfer.Chart #region 统计所有 var systemCode = Funs.DB.Transfer_LHCSystemList .Where(x => x.ProjectId == CurrUser.LoginProjectId) - .GroupBy(p => new { p.Commissioningsystemcode }) - .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList(); + .GroupBy(p => new { p.SubCommissioningsystem }) + .Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList(); if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue)) { systemCode= Funs.DB.Transfer_LHCSystemList - .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.Commissioningsystemcode == ddlSystemNo.SelectedValue) - .GroupBy(p => new { p.Commissioningsystemcode }) - .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList(); + .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.SubCommissioningsystem == ddlSystemNo.SelectedValue) + .GroupBy(p => new { p.SubCommissioningsystem }) + .Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList(); } #region 九个表的数据 var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid).ToList(); @@ -67,7 +67,7 @@ namespace FineUIPro.Web.Transfer.Chart dt.Columns.Add("进行中数量", typeof(string)); dt.Columns.Add("未完成数量", typeof(string)); foreach (var t in systemCode) { - var scode = t.Commissioningsystemcode; + var scode = t.SubCommissioningsystem; AllSystemNo += "'" + scode + "',"; DataRow dr = dt.NewRow(); dr["系统编号"] = scode; diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx index ebdf02d7..eea03c21 100644 --- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx @@ -81,7 +81,7 @@ + HeaderTextAlign="Center" MinWidth="180px">