From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml | 12 ++++++++++++
1 files changed, 12 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 70f146f..a2b6082 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
@@ -152,6 +152,7 @@
<where>
AND t1.status = '22'
AND t1.alarm = #{ vo.alarmCode }
+ AND (t1.start_time <= #{ endDate } AND t1.end_time >= #{ startDate })
<if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
AND t1.equipment_id IN
<foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
@@ -161,5 +162,16 @@
</where>
</select>
+ <select id="getDataList" resultType="java.lang.Integer">
+ SELECT
+ status
+ FROM
+ mdc_equipment_running_section
+ WHERE
+ equipment_id = #{ equipmentId }
+ AND start_time > #{date}
+ AND status IS NOT NULL
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3