changes

liuhaonan

2022-08-12 a49a6a80a76b2642232b887dd646a255cf5eaa4e

 dao/src/main/resources/mapper/C3mChargingMapper.xml

@@ -5,18 +5,20 @@
<mapper namespace="com.sandu.ximon.dao.mapper.C3mChargingMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.C3mCharging">
            <id property="c3Id" column="c3_id" jdbcType="BIGINT"/>
            <result property="mcuUdid" column="mcu_udid" jdbcType="VARCHAR"/>
            <result property="c3Name" column="c3_name" jdbcType="VARCHAR"/>
            <result property="c3Mac" column="c3_mac" jdbcType="VARCHAR"/>
            <result property="statusBit" column="status_bit" jdbcType="INTEGER"/>
            <result property="deviceTemperature" column="device_temperature" jdbcType="VARCHAR"/>
            <result property="poleDevicesCode" column="pole_devices_code" jdbcType="VARCHAR"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <id property="c3Id" column="c3_id" jdbcType="BIGINT"/>
        <result property="mcuUdid" column="mcu_udid" jdbcType="VARCHAR"/>
        <result property="c3Name" column="c3_name" jdbcType="VARCHAR"/>
        <result property="c3Mac" column="c3_mac" jdbcType="VARCHAR"/>
        <result property="statusBit" column="status_bit" jdbcType="INTEGER"/>
        <result property="deviceTemperature" column="device_temperature" jdbcType="VARCHAR"/>
        <result property="poleDevicesCode" column="pole_devices_code" jdbcType="VARCHAR"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        c3_id,mcu_udid,c3_name,
        c3_id
        ,mcu_udid,c3_name,
        c3_mac,status_bit,device_temperature,
        pole_devices_code,update_time
    </sql>
@@ -36,12 +38,14 @@
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        <where>
            <if test="keyword != null and keyword != ''">
                AND (t1.c3_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR (t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')))
                AND (t1.c3_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR (t3.pole_name LIKE CONCAT(CONCAT('%',
                #{keyword}), '%')))
            </if>
            <if test="userid != null">
                AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
            </if>
        </where>
        ORDER BY ${orderBy}
    </select>
</mapper>