From a6d22f16447c4b440b269fa8b43daf919e5a10c4 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 12 十月 2023 10:11:25 +0800
Subject: [PATCH] update

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
index 58c6950..003fed6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
@@ -86,6 +86,7 @@
             </if>
             AND (start_time &lt;= #{ vo.endDate } AND end_time &gt;= #{ vo.startDate })
             AND status = '22'
+            AND alarm != ''
         </where>
         ORDER BY
             start_time
@@ -100,7 +101,7 @@
         <where>
             AND status = '22'
             AND alarm = #{ alarmCode }
-            AND (start_time &lt;= #{ vo.endDate } AND end_time &gt;= #{ vo.startDate })
+            AND (start_time &lt;= #{ endDate } AND end_time &gt;= #{ startDate })
             AND equipment_id = #{ equipmentId }
         </where>
     </select>

--
Gitblit v1.9.3