From 3320df960ae37b4f6611baf6a6954e20b3b88fee Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期四, 13 三月 2025 15:29:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml | 15 +++++++++++++++ 1 files changed, 15 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 a2b6082..dd35b9f 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 @@ -173,5 +173,20 @@ AND status IS NOT NULL </select> + <select id="findWaitList" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentWaitSectionDto"> + SELECT + t1.*, + t2.equipment_name + FROM + mdc_equipment_running_section t1 + LEFT JOIN mdc_equipment t2 ON t1.equipment_id = t2.equipment_id + WHERE + duration > 1200 + AND status = 2 + AND CONVERT ( VARCHAR, start_time, 120 ) LIKE CONCAT(#{date},'%') + ORDER BY + equipment_id, start_time DESC + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.3