From 2473cd2814fd7c8fa1d132704dd9ab190f43f3ff Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 20 六月 2025 14:17:09 +0800
Subject: [PATCH] 同步涉密网功能
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
index b249fad..d7c9488 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
@@ -18,10 +18,14 @@
t1.open_long / 86400 openRate,
t1.open_long openLong,
t1.wait_long waitLong,
- t1.close_long closeLong
+ t1.close_long closeLong,
+ COALESCE(t3.fault_long, 0) faultLong,
+ COALESCE(t3.fault_rate, 0) faultRate,
+ COALESCE(t3.remove_fault_run_long, 0) removeFaultRunLong
FROM
mdc_equipment t2
LEFT JOIN mdc_equipment_statistical_info t1 ON t1.equipment_id = t2.equipment_id
+ LEFT JOIN mdc_equipment_fault_info t3 ON t2.equipment_id = t3.equipment_id AND t1.the_date = t3.the_date
WHERE
t1.the_date <= #{ vo.endTime }
AND t1.the_date >= #{ vo.startTime }
@@ -191,7 +195,8 @@
SELECT
t3.equipment_name,
t1.utilization_rate AS utilizationRate,
- t2.utilization_rate AS shiftUtilizationRate
+ t2.utilization_rate AS shiftUtilizationRate,
+ t1.remove_fault_rate AS amendUtilizationRate
FROM
mdc_equipment_statistical_info_month t1
LEFT JOIN mdc_equipment_statistical_shift_info_month t2 ON t1.the_month = t2.the_month AND t2.shift_type = 1
@@ -211,7 +216,8 @@
SELECT
t3.team_code AS teamCode,
t1.utilization_rate AS utilizationRate,
- t2.utilization_rate AS shiftUtilizationRate
+ t2.utilization_rate AS shiftUtilizationRate,
+ t1.remove_fault_rate AS amendUtilizationRate
FROM
mdc_equipment_statistical_info_month t1
LEFT JOIN mdc_equipment_statistical_shift_info_month t2 ON t1.the_month = t2.the_month AND t2.shift_type = 1
@@ -230,6 +236,7 @@
t1.the_month AS theMonth,
AVG ( t1.utilization_rate ) AS utilizationRate,
AVG ( t2.utilization_rate ) AS shiftUtilizationRate,
+ AVG ( t1.remove_fault_rate ) AS amendUtilizationRate,
SUM ( t1.process_long ) AS processLong
FROM
mdc_equipment_statistical_info_month t1
--
Gitblit v1.9.3