From 378dc038fc63cd9003497f9a458376e781df64db Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期日, 28 四月 2024 10:59:30 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
index 303e102..be774b6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
@@ -10,7 +10,7 @@
t1.equipment_name,
t1.equipment_model,
t1.valid_date,
- t2.shift_sub_name shiftSubId,
+ t1.shift,
t1.shift_time_count,
t1.overtime,
t1.actual_work_day_count,
@@ -37,17 +37,11 @@
t1.update_by,
t1.update_time
FROM
- mdc_overall_equipment_efficiency t1 LEFT JOIN mdc_shift_sub t2 ON t1.shift_sub_id = t2.id
- LEFT JOIN mdc_shift t3 ON t2.shift_id = t3.id
+ mdc_overall_equipment_efficiency t1
+ LEFT JOIN mdc_equipment t2 ON t1.equipment_id = t2.equipment_id
<where>
<if test="mdcOverallEquipmentEfficiency.startTime != null and mdcOverallEquipmentEfficiency.startTime != '' and mdcOverallEquipmentEfficiency.endTime != null and mdcOverallEquipmentEfficiency.endTime != ''">
AND t1.valid_date BETWEEN #{ mdcOverallEquipmentEfficiency.startTime } AND #{ mdcOverallEquipmentEfficiency.endTime }
- </if>
- <if test="mdcOverallEquipmentEfficiency.shiftId != null and mdcOverallEquipmentEfficiency.shiftId != ''">
- AND t3.id = #{ mdcOverallEquipmentEfficiency.shiftId }
- </if>
- <if test="mdcOverallEquipmentEfficiency.shiftSubId != null and mdcOverallEquipmentEfficiency.shiftSubId != ''">
- AND t1.shift_sub_id = #{ mdcOverallEquipmentEfficiency.shiftSubId }
</if>
<if test="mdcOverallEquipmentEfficiency.equipmentIdList != null and mdcOverallEquipmentEfficiency.equipmentIdList.size() > 0 ">
AND t1.equipment_id IN
@@ -55,6 +49,18 @@
#{ id }
</foreach>
</if>
+ <if test="mdcOverallEquipmentEfficiency.driveType != null and mdcOverallEquipmentEfficiency.driveType != ''">
+ AND t2.drive_type = #{ mdcOverallEquipmentEfficiency.driveType }
+ </if>
+ <if test="mdcOverallEquipmentEfficiency.deviceLevel != null and mdcOverallEquipmentEfficiency.deviceLevel != ''">
+ AND t2.device_level = #{ mdcOverallEquipmentEfficiency.deviceLevel }
+ </if>
+ <if test="mdcOverallEquipmentEfficiency.deviceCategory != null and mdcOverallEquipmentEfficiency.deviceCategory != ''">
+ AND t2.device_category = #{ mdcOverallEquipmentEfficiency.deviceCategory }
+ </if>
+ <if test="mdcOverallEquipmentEfficiency.equipmentType != null and mdcOverallEquipmentEfficiency.equipmentType != ''">
+ AND t2.equipment_type = #{ mdcOverallEquipmentEfficiency.equipmentType }
+ </if>
</where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3