zhubaomin
2025-05-07 73ef7206a89b119a68b7de9abd68c7664d1c605c
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -50,13 +50,16 @@
        ge.`operator`,
        ge.operateDt,
        blo.`name`                                          AS blockName,
        CONCAT(country.`name`, town.`name`, village.`name`)              AS address
        CONCAT(country.`name`, town.`name`, village.`name`)              AS address,
        con.rtuAddr,
        con.protocol
        FROM pr_intake ge
        INNER JOIN pr_divide divi ON ge.divideId = divi.id
        INNER JOIN ba_block blo ON divi.blockId = blo.id
        LEFT JOIN ba_district country ON ge.countyId = country.id
        LEFT JOIN ba_district town ON ge.townId = town.id
        LEFT JOIN ba_district village ON ge.villageId = village.id
        INNER JOIN pr_controller con ON con.intakeId = ge.id
        where ge.id = #{id,jdbcType=BIGINT}
        AND ge.deleted = 0
        AND divi.deleted = 0
@@ -378,7 +381,7 @@
                AND bindNumTb.num = #{bindNumber}
            </if>
        </where>
        ORDER BY ge.operateDt DESC
        ORDER BY ge.divideId DESC, ge.id DESC
        <trim prefix="limit ">
            <if test="start != null and count != null">
                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}