This commit is contained in:
2024-12-05 17:22:17 +08:00
parent 20cb5d9fef
commit 3984e18e6c
3 changed files with 58 additions and 38 deletions
@@ -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 SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by SubCommissioningsystem,ProjectId
SELECT SubCommissioningsystem as SubSysNo,Type,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,Type,ProjectId
) f
left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
--piping
@@ -160,7 +160,7 @@ left join (select count(*)as TtScount,ProjectId,Test_Package from Transfer_Telec
group by ProjectId,Test_Package)
Tt1 on f.ProjectId=Tt1.ProjectId and f.SubSysNo=Tt1.Test_Package
where f.ProjectId = @ProjectId";
where f.ProjectId = @ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -169,8 +169,14 @@ where f.ProjectId = @ProjectId";
{
strSql += " AND f.SubSysNo='" + ddlSubSysNo.SelectedValue + "' ";
}
if (!string.IsNullOrEmpty(drpType.SelectedValue))
{
strSql += " AND f.Type='" + drpType.SelectedValue + "' ";
}
strSql += " order by f.SubSysNo ";
//strSql += " order by f.Type ";
//strSql += " order by f.SubSysNo ";
strSql += " order by f.Type,f.SubSysNo ";
SqlParameter[] parameter = listStr.ToArray();
return SQLHelper.GetDataTableRunText(strSql, parameter);
}