From bb1a96551d4e9eafed275015789d8d0cb6ffd3ea Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 04 九月 2025 17:03:07 +0800 Subject: [PATCH] 更新说明 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml index b3a2f9a..ffcc41e 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml @@ -22,13 +22,13 @@ me.id equId FROM EquipmentLog a - INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID - INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID - INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID - INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name - AND a.CollectTime= b.maxgdtime - AND mew.workshop_id = #{ workshopId } - LEFT JOIN ( + INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID + INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID + INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID + INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name + AND a.CollectTime= b.maxgdtime + AND mew.workshop_id = #{ workshopId } + LEFT JOIN ( SELECT e1.equipment_code, COUNT(1) COUNT -- Gitblit v1.9.3