From 3a17c000be3c8abc35e177743ea83c9cf3183bc0 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Wed, 23 Jul 2025 10:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HSSE/TowerCrane/TowerCraneRecord.aspx.cs          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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);