From 81e5a11d1f8cc8eaeb7875bdafe36a86379d6231 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 12 九月 2024 11:21:18 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 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..267045c 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 @@ -70,7 +79,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 @@ -117,7 +135,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> </where> GROUP BY -- Gitblit v1.9.3