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 |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 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 ad4fba3..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,10 +86,44 @@
             </if>
             AND (start_time &lt;= #{ vo.endDate } AND end_time &gt;= #{ vo.startDate })
             AND status = '22'
+            AND alarm != ''
         </where>
         ORDER BY
             start_time
     </select>
 
+    <!--鏌ヨ鏁伴噺-->
+    <select id="findAlarmCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*)
+        FROM
+            mdc_equipment_running_section
+        <where>
+            AND status = '22'
+            AND alarm = #{ alarmCode }
+            AND (start_time &lt;= #{ endDate } AND end_time &gt;= #{ startDate })
+            AND equipment_id = #{ equipmentId }
+        </where>
+    </select>
+
+    <!--鏍规嵁鏃ユ湡鏌ヨ鏁伴噺-->
+    <select id="findAlarmCountByDate" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*)
+        FROM
+            mdc_equipment_running_section
+        <where>
+            AND status = '22'
+            AND alarm = #{ vo.alarmCode }
+            AND (start_time &lt;= #{ endDate } AND end_time &gt;= #{ startDate })
+            <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
+                AND equipment_id IN
+                <foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
+                    #{ id }
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3