From 88c6a0e35a1edc37872fb11725c229124b037c43 Mon Sep 17 00:00:00 2001
From: yb <1113799@qq.com>
Date: 星期五, 05 九月 2025 13:19:16 +0800
Subject: [PATCH] 倍率统计导出bug调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml
index 871dcd8..c6d5a8b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml
@@ -27,7 +27,32 @@
#{ id }
</foreach>
</if>
- ORDER BY t1.the_date ASC
+ ORDER BY t1.the_date,t1.equipment_id ASC
</select>
+
+ <!--鍒嗛〉鍒楄〃鏌ヨ-->
+ <select id="list" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentMagnificationDto">
+ SELECT
+ *
+ FROM
+ mdc_equipment_magnification t1
+ WHERE 1=1
+ <if test="magnificationVo.equipmentId != null and magnificationVo.equipmentId != ''">
+ AND t1.equipment_id = #{ magnificationVo.equipmentId }
+ </if>
+ <if test="magnificationVo.startTime != null and magnificationVo.startTime != ''">
+ AND t1.the_date >= #{ magnificationVo.startTime }
+ </if>
+ <if test="magnificationVo.endTime != null and magnificationVo.endTime != ''">
+ AND t1.the_date <= #{ magnificationVo.endTime }
+ </if>
+ <if test="magnificationVo.equipmentIdList != null and magnificationVo.equipmentIdList.size() > 0 ">
+ AND t1.equipment_id IN
+ <foreach collection="magnificationVo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
+ #{ id }
+ </foreach>
+ </if>
+ ORDER BY t1.the_date,t1.equipment_id ASC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3