From cf89583e4dd54632a0f11c06b859315c03958820 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 17 一月 2024 17:36:41 +0800
Subject: [PATCH] 设备运行状态及利用率预警任务
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 c7b0eb8..5320b97 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
@@ -25,6 +25,9 @@
WHERE
t1.the_date <= #{ vo.endTime }
AND t1.the_date >= #{ vo.startTime }
+ <if test="vo.equipmentType != null and vo.equipmentType != '' ">
+ AND t2.equipment_type = #{ vo.equipmentType }
+ </if>
<if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
AND t2.equipment_id IN
<foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
@@ -60,6 +63,9 @@
WHERE
t1.the_date <= #{ vo.endTime }
AND t1.the_date >= #{ vo.startTime }
+ <if test="vo.equipmentType != null and vo.equipmentType != '' ">
+ AND t2.equipment_type = #{ vo.equipmentType }
+ </if>
<if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
AND t2.equipment_id IN
<foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
@@ -81,7 +87,8 @@
SUM ( t1.process_long ) processLong,
SUM ( t1.open_long ) openLong,
SUM ( t1.wait_long ) waitLong,
- SUM ( t1.close_long ) closeLong
+ SUM ( t1.close_long ) closeLong,
+ sum ( t1.total_long ) totalLong
FROM
mdc_equipment t2
LEFT JOIN mdc_equipment_statistical_shift_info t1 ON t1.equipment_id = t2.equipment_id
@@ -99,6 +106,9 @@
</if>
<if test="vo.shiftSubId != null and vo.shiftSubId != ''">
AND t1.shift_sub_id = #{ vo.shiftSubId }
+ </if>
+ <if test="vo.equipmentType != null and vo.equipmentType != '' ">
+ AND t2.equipment_type = #{ vo.equipmentType }
</if>
</where>
GROUP BY
@@ -138,4 +148,15 @@
GROUP BY
mesi.equipment_id
</select>
+
+
+ <select id="getEfficiencyRate" resultType="java.math.BigDecimal">
+ SELECT
+ process_long
+ FROM
+ mdc_equipment_statistical_info
+ WHERE
+ equipment_id = #{ equipmentId } AND the_date >= #{ date }
+ ORDER BY the_date ASC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3