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-12-06 09:09:51 +08:00
parent 20363206d7
commit f31a3fe9fa
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
+5 -4
View File
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.Transfer.Chart
public DataTable DataSql()
{
string strSql = @"select f.SubSysNo,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
string strSql = @"select f.SubSysNo,lhcs.CommissioningCodeDescription,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
case ISNULL(tpi3.TotalFactor,0) when 0 then 0
else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi3.CompleteFactor,0)*1.0/ISNULL(tpi3.TotalFactor,0))) end CompleteProportion,
@@ -86,8 +86,9 @@ 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 SubCommissioningsystem as SubSysNo,SN,Type,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,SN,Type,ProjectId
SELECT SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,ProjectId
) f
left join Transfer_LHCSystemList lhcs on f.ProjectId=lhcs.ProjectId and f.SubSysNo=lhcs.SubCommissioningsystem
left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
--piping
@@ -171,12 +172,12 @@ where f.ProjectId = @ProjectId ";
}
if (!string.IsNullOrEmpty(drpType.SelectedValue))
{
strSql += " AND f.Type='" + drpType.SelectedValue + "' ";
strSql += " AND lhcs.Type='" + drpType.SelectedValue + "' ";
}
//strSql += " order by f.Type ";
//strSql += " order by f.SubSysNo ";
strSql += " order by f.Type,f.SN ";
strSql += " order by lhcs.Type,lhcs.SN ";
SqlParameter[] parameter = listStr.ToArray();
return SQLHelper.GetDataTableRunText(strSql, parameter);
}