From 2fd5cedf6e6aedc2fdd089c38fee6194a6dea3e5 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 18 四月 2024 10:37:35 +0800 Subject: [PATCH] 前七天利用率折线图接口修改 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 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 7e17582..d89d259 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 @@ -38,6 +38,7 @@ t1.update_time FROM 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 } @@ -48,6 +49,15 @@ #{ 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> </where> </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3