From dfadab4fecc90bd2ad720dc67eba44c4b69b155a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 05 三月 2025 10:05:40 +0800
Subject: [PATCH] art: 所有设备 台账 维修工单 根据设备id查询维修工单,并过滤掉已完成的维修工单
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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 5320b97..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
@@ -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,
--
Gitblit v1.9.3