From 876e8a1c9e6e950d51e42f265ad3027869d4f908 Mon Sep 17 00:00:00 2001 From: hyingbo <1363390067@qq.com> Date: 星期二, 22 七月 2025 18:26:06 +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