diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs index 41348d82..a5a4e661 100644 --- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs @@ -105,9 +105,16 @@ namespace FineUIPro.Web.HSSE.TowerCrane listStr.Add(new SqlParameter("@TowerCraneId", TowerCraneId)); if (ckIsWarnOnly.Checked) { - strSql += " and AlarmType is not null "; + strSql += " and AlarmType is not null "; + } + if (!string.IsNullOrEmpty(txtStartTime.Text)) + { + strSql += " and Date >='"+ txtStartTime.Text + "' "; + } + if (!string.IsNullOrEmpty(txtEndTime.Text)) + { + strSql += " and Date <='" + txtEndTime.Text + "' "; } - strSql += " order by Date desc"; SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);