From b5f919e8cc4301b71ff6b12de93f7aefc823ca6d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 21 十月 2025 09:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml
index 7a0a384..c026425 100644
--- a/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml
+++ b/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml
@@ -7,15 +7,24 @@
<select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod">
select * from energy_period
<where>
- <if test="energyPeriod.startTime != null">
- start_time = #{energyPeriod.startTime}
- </if>
- <if test="energyPeriod.endTime != null">
- and end_time = #{energyPeriod.endTime}
+ <if test="energyPeriod.date != null">
+ date = #{energyPeriod.date}
</if>
<if test="energyPeriod.price != null">
and price = #{energyPeriod.price}
</if>
+ <if test="energyPeriod.peak != null">
+ and peak = #{energyPeriod.peak}
+ </if>
+ <if test="energyPeriod.valley != null">
+ and valley = #{energyPeriod.valley}
+ </if>
+ <if test="energyPeriod.flat != null">
+ and flat = #{energyPeriod.flat}
+ </if>
+ <if test="energyPeriod.sharp != null">
+ and sharp = #{energyPeriod.sharp}
+ </if>
</where>
</select>
</mapper>
--
Gitblit v1.9.3