From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 10 七月 2025 10:43:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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 e5492b7..fdd58e4 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 @@ -38,6 +38,7 @@ mdc_equipment_running_section WHERE equipment_id = #{ equipmentId } + AND status <![CDATA[ <> ]]> '22' AND (start_long <= #{ endLong } AND end_long >= #{ startLong }) ORDER BY start_time @@ -162,5 +163,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