Merge remote-tracking branch 'origin/master' into pim_yys

maven

2025-08-12 b0765ec5be45d6db1993064d5261bf42e94d161f

 src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml

对比新文件
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.equipmentenergyconsumption.mapper.EnergyPeriodMapper">


    <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod">
        select * from energy_period
        <where>
            <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>