From 36deabe1df249a56a553fb606447dd326a2c81a7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 06 三月 2025 15:22:54 +0800
Subject: [PATCH] UPDATE
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 78 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 2 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 0785e3a..fbf4917 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
@@ -28,12 +28,25 @@
<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.deviceLevel != null and vo.deviceLevel != '' ">
+ AND t2.device_level = #{vo.deviceLevel}
+ </if>
+ <if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
+ AND t2.device_category = #{vo.deviceCategory}
+ </if>
+ <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
+ AND t2.device_importance_level = #{vo.deviceImportanceLevel}
+ </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=",">
#{ id }
</foreach>
</if>
+ AND t2.device_abnormal_status = 1
ORDER BY t1.the_date
</select>
@@ -66,12 +79,25 @@
<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.deviceLevel != null and vo.deviceLevel != '' ">
+ AND t2.device_level = #{vo.deviceLevel}
+ </if>
+ <if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
+ AND t2.device_category = #{vo.deviceCategory}
+ </if>
+ <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
+ AND t2.device_importance_level = #{vo.deviceImportanceLevel}
+ </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=",">
#{ id }
</foreach>
</if>
+ AND t2.device_abnormal_status = 1
ORDER BY t1.the_date
</select>
@@ -110,6 +136,19 @@
<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.deviceLevel != null and vo.deviceLevel != '' ">
+ AND t2.device_level = #{vo.deviceLevel}
+ </if>
+ <if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
+ AND t2.device_category = #{vo.deviceCategory}
+ </if>
+ <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
+ AND t2.device_importance_level = #{vo.deviceImportanceLevel}
+ </if>
+ AND t2.device_abnormal_status = 1
</where>
GROUP BY
t2.equipment_id,
@@ -140,12 +179,47 @@
#{ id }
</foreach>
</if>
- <if test="vo.driveType != null and vo.driveType != null">
- AND me.drive_type = #{ vo.driveType }
+ <if test="vo.driveTypeList != null and vo.driveTypeList .size() > 0 ">
+ AND me.drive_type IN
+ <foreach collection="vo.driveTypeList" item="driveType" index="index" open="(" close=")" separator=",">
+ #{ driveType }
+ </foreach>
+ </if>
+ <if test="vo.equipmentTypeList != null and vo.equipmentTypeList.size() > 0 ">
+ AND me.equipment_type IN
+ <foreach collection="vo.equipmentTypeList" item="equipmentType" index="index" open="(" close=")" separator=",">
+ #{ equipmentType }
+ </foreach>
+ </if>
+ <if test="vo.deviceLevelList != null and vo.deviceLevelList.size() > 0 ">
+ AND me.device_level IN
+ <foreach collection="vo.deviceLevelList" item="deviceLevel" index="index" open="(" close=")" separator=",">
+ #{ deviceLevel }
+ </foreach>
+ </if>
+ <if test="vo.deviceCategoryList != null and vo.deviceCategoryList.size() > 0 ">
+ AND me.device_category IN
+ <foreach collection="vo.deviceCategoryList" item="deviceCategory" index="index" open="(" close=")" separator=",">
+ #{ deviceCategory }
+ </foreach>
+ </if>
+ <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
+ AND me.device_importance_level = #{vo.deviceImportanceLevel}
</if>
AND mesi.the_date BETWEEN #{ vo.startTime } AND #{ vo.endTime }
</where>
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