From c51323e6fcc84f08bc8c01e3dd6c916427f83f4e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 三月 2024 10:41:50 +0800
Subject: [PATCH] 设备状态长时间未变化算法更新
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 78901bf..357a4b8 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,12 @@
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.driveType != null and vo.driveType != '' ">
+ AND t2.drive_type = #{ vo.driveType }
+ </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 +66,12 @@
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.driveType != null and vo.driveType != '' ">
+ AND t2.drive_type = #{ vo.driveType }
+ </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=",">
@@ -101,6 +113,12 @@
<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>
+ <if test="vo.driveType != null and vo.driveType != '' ">
+ AND t2.drive_type = #{ vo.driveType }
+ </if>
</where>
GROUP BY
t2.equipment_id,
@@ -139,4 +157,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