From 2c250bb7d2c0efd16e5f124648bc77f5fd93040a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 29 十月 2023 22:05:14 +0800
Subject: [PATCH] 增加下次三保时间 技术状态类型及单号
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 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 c0e00a6..1a0ecf1 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
@@ -9,7 +9,7 @@
a.EquipmentID equipmentId,
me.equipment_name equipmentName,
me.equipment_type equipmentType,
- mew.equipment_image equipmentImage,
+ met.equipment_type_pictures equipmentImage,
a.Oporation equipmentStatus,
mew.coordinate_left coordinateLeft,
mew.coordinate_top coordinateTop,
@@ -20,6 +20,7 @@
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 }
</select>
--
Gitblit v1.9.3