From ac4d1a5962441156ff22a0c87f4eacc083daa9a6 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 20 六月 2025 11:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml
index e542769..62ae98e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml
@@ -15,16 +15,20 @@
<select id="findByEquipmentAndMonth" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentStatisticalDto">
SELECT
- SUM(open_long) openLong,
- SUM(close_long) closeLong,
- SUM(wait_long) waitLong,
- SUM(process_long) processLong,
- SUM(error_long) errorLong,
+ SUM ( t1.open_long ) openLong,
+ SUM ( t1.close_long ) closeLong,
+ SUM ( t1.wait_long ) waitLong,
+ SUM ( t1.process_long ) processLong,
+ SUM ( t1.error_long ) errorLong,
+ SUM ( t2.fault_long ) faultLong,
+ AVG ( t2.fault_rate ) faultRate,
+ SUM ( t2.remove_fault_run_long ) removeFaultRunLong,
+ AVG ( t2.remove_fault_rate ) removeFaultRate,
COUNT(*) dayNum
FROM
- mdc_equipment_statistical_info
+ mdc_equipment_statistical_info t1 LEFT JOIN mdc_equipment_fault_info t2 ON t1.equipment_id = t2.equipment_id AND t1.the_date = t2.the_date
WHERE
- equipment_id = #{equipmentId} AND the_date LIKE CONCAT(#{date}, '%')
+ t1.equipment_id = #{equipmentId} AND t1.the_date LIKE CONCAT(#{date}, '%')
</select>
<select id="findByEquIdsAndMonth" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo">
--
Gitblit v1.9.3