This commit is contained in:
2024-07-25 14:59:26 +08:00
parent 4023edecf9
commit 98029fa93c
38 changed files with 2527 additions and 1325 deletions
@@ -40,22 +40,27 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Civil_Structure like @Civil_Structure";
listStr.Add(new SqlParameter("@Civil_Structure", "%" + this.txtCivil_Structure.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
{
strSql += " AND Test_Package_START >= @InspectionDateA";
listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
{
strSql += " AND Test_Package_START <= @InspectionDateZ";
listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
}
//if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
//{
// strSql += " AND Test_Package_START >= @InspectionDateA";
// listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
//{
// strSql += " AND Test_Package_START <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
{
strSql += " AND SystemName like @SystemName";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{
strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
}
strSql += " order by Civil_Structure ";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);