From 80e505b03b3be711aa49662ba2ce35b4fcf516e4 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 21 十一月 2023 15:19:27 +0800
Subject: [PATCH] OEE设备综合效率算法调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml | 11 ++---------
1 files changed, 2 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..7e17582 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,10 @@
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
<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
--
Gitblit v1.9.3