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

maven

2025-08-12 b0765ec5be45d6db1993064d5261bf42e94d161f

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

对比新文件
@@ -0,0 +1,27 @@
<?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.ElectricityConsumptionAreaMapper">

    <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea">
        select * from electricity_consumption_area
        <where>
            <if test="electricityConsumptionArea.id != null">
                id = #{electricityConsumptionArea.id}
            </if>
            <if test="electricityConsumptionArea.areaName != null and electricityConsumptionArea.areaName != ''">
                and area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
            </if>
            <if test="electricityConsumptionArea.areaType != null and electricityConsumptionArea.areaType != ''">
                and area_type like CONCAT('%', #{electricityConsumptionArea.areaType}, '%')
            </if>
            <if test="electricityConsumptionArea.sort != null">
                and sort = #{electricityConsumptionArea.sort}
            </if>
            <if test="electricityConsumptionArea.fuId != null">
                and fu_id = #{electricityConsumptionArea.fuId}
            </if>
        </where>
    </select>

</mapper>