合并最新
This commit is contained in:
@@ -47,14 +47,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
|
||||
rootNode.CommandArgument = installation.UnitId;
|
||||
rootNode.ToolTip = installation.InstallationCode;
|
||||
rootNode.EnableClickEvent = true;
|
||||
if (installation.InstallationName != "总图")
|
||||
{
|
||||
rootNode.Expanded = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
rootNode.EnableExpandEvent = true;
|
||||
}
|
||||
rootNode.EnableExpandEvent = true;
|
||||
this.trWBS.Nodes.Add(rootNode);
|
||||
var installation1s = from x in Funs.DB.Project_Installation
|
||||
where x.SuperInstallationId == installation.InstallationId
|
||||
@@ -254,7 +247,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
|
||||
}
|
||||
else //不存在子单位工程,加载分部工程
|
||||
{
|
||||
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.Flag == 1 && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
|
||||
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
|
||||
if (wbsSet1s.Count() > 0)
|
||||
{
|
||||
foreach (var wbsSet1 in wbsSet1s)
|
||||
@@ -280,7 +273,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
|
||||
}
|
||||
else //单位工程下直接是分项内容,如质量行为
|
||||
{
|
||||
var wbsSet3s = from x in Funs.DB.Wbs_WbsSet where x.Flag == 3 && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
|
||||
var wbsSet3s = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
|
||||
if (wbsSet3s.Count() > 0)
|
||||
{
|
||||
foreach (var wbsSet3 in wbsSet3s)
|
||||
@@ -309,7 +302,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
|
||||
}
|
||||
else if (e.Node.CommandName == "childUnitProject") //展开子单位工程节点
|
||||
{
|
||||
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.Flag == 1 && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
|
||||
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
|
||||
foreach (var wbsSet1 in wbsSet1s)
|
||||
{
|
||||
TreeNode newNode = new TreeNode();
|
||||
@@ -420,11 +413,11 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
|
||||
toWbs += nodeId + ",";
|
||||
}
|
||||
string strSql = "select distinct (cast(YEAR(Months) as varchar(4))+'.'+cast(MONTH(Months) as varchar(2))) as 月份,t.Months, (select SUM(PlanValue) from dbo.WbsDetail where Months=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 计划值," +
|
||||
"(select SUM(PlanValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 计划累积值 ," +
|
||||
"(select SUM(PlanValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 累计计划值 ," +
|
||||
"(select SUM(CompleteValue) from dbo.WbsDetail where Months=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 完成值," +
|
||||
"(select SUM(CompleteValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 完成累积值," +
|
||||
"(select SUM(CompleteValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 累计完成值," +
|
||||
"(select SUM(RealValue) from dbo.WbsDetail where Months=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 实耗值," +
|
||||
"(select SUM(RealValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 实耗累积值 " +
|
||||
"(select SUM(RealValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 累计实耗值 " +
|
||||
"from dbo.WbsDetail as t where CHARINDEX(t.ToWbs,@ToWbs)>0 order by t.Months";
|
||||
string date = DateTime.Now.Year + "-" + DateTime.Now.Month + "-01";
|
||||
SqlParameter[] parameter = new SqlParameter[]
|
||||
@@ -435,7 +428,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
|
||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
this.Grid1.DataSource = dt;
|
||||
this.Grid1.DataBind();
|
||||
this.ChartEV.CreateMaryChart(dt, 820, 320, null);
|
||||
this.ChartEV.CreateMaryChart(dt, 920, 420, null);
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
Reference in New Issue
Block a user