From c659ff50dfce120d02fa906a33f7b4ab20ffddc2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 11 十一月 2024 11:37:21 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 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 10cdba9..40631f8 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
@@ -29,7 +29,16 @@
AND t2.equipment_type = #{ vo.equipmentType }
</if>
<if test="vo.driveType != null and vo.driveType != '' ">
- AND t2.drive_type = #{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
@@ -37,6 +46,7 @@
#{ id }
</foreach>
</if>
+ AND t2.device_abnormal_status = 1
ORDER BY t1.the_date
</select>
@@ -70,7 +80,16 @@
AND t2.equipment_type = #{ vo.equipmentType }
</if>
<if test="vo.driveType != null and vo.driveType != '' ">
- AND t2.drive_type = #{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
@@ -78,6 +97,7 @@
#{ id }
</foreach>
</if>
+ AND t2.device_abnormal_status = 1
ORDER BY t1.the_date
</select>
@@ -117,8 +137,18 @@
AND t2.equipment_type = #{ vo.equipmentType }
</if>
<if test="vo.driveType != null and vo.driveType != '' ">
- AND t2.drive_type = #{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,
--
Gitblit v1.9.3