优化接口 获得一个取水口接口 优化传参方式、增加片区名称和地址两个字段

wuzeyu

2024-12-16 6dd90a95c5dff764f7ea6e8f61a36fc0e3bf6aa3

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml

@@ -34,13 +34,33 @@
        operateDt,
        deleted
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voPr.VoAllIntake">
        <!--@mbg.generated-->
        select
        <include refid="Base_Column_List"/>
        from pr_intake
        where id = #{id,jdbcType=BIGINT}
        and deleted = 0
        ge.id,
        ge.countyId,
        ge.townId,
        ge.villageId,
        ge.divideId,
        ge.blockId,
        ge.`name`,
        ge.lng,
        ge.lat,
        ge.remarks,
        ge.`operator`,
        ge.operateDt,
        blo.`name`                                          AS blockName,
        CONCAT(country.`name`, town.`name`, village.`name`)              AS address
        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
        where ge.id = #{id,jdbcType=BIGINT}
        AND ge.deleted = 0
        AND divi.deleted = 0
        AND blo.deleted = 0
    </select>

    <delete id="deleteLogicById" parameterType="java.lang.Long">