From 3fd120cf8b15c55627bc45070e4109972db9b529 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 22 一月 2025 11:29:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master' --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml index 1348a36..bef22c8 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml @@ -26,6 +26,8 @@ id, countyId, townId, villageId, blockId, `name`, villages, area, `header`, phone, lng, lat, remarks, `operator`, operateDt, deleted </sql> + + <!--2025-01-21 搴熷純--> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <!--@mbg.generated--> select @@ -33,6 +35,36 @@ from pr_divide where id = #{id,jdbcType=BIGINT} </select> + + <select id="getDivideDetails" resultType="com.dy.pipIrrGlobal.voPr.VoDivideDetails"> + SELECT + divi.id, + divi.countyId, + divi.townId, + divi.villageId, + divi.blockId, + divi.name, + divi.villages, + divi.area, + divi.header, + divi.phone, + divi.lat, + divi.lng, + divi.operateDt, + divi.operator, + blo.`name` AS blockName, + CONCAT(country.`name`, town.`name`, village.`name`) AS address, + divi.remarks + FROM pr_divide divi + INNER JOIN ba_block blo ON divi.blockId = blo.id + Left JOIN ba_district country ON divi.countyId = country.id + Left JOIN ba_district town ON divi.townId = town.id + Left JOIN ba_district village ON divi.villageid = village.id + , (SELECT @i:=0) AS itable + WHERE divi.deleted = 0 AND divi.id = #{id} + </select> + + <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <!--@mbg.generated--> delete from pr_divide -- Gitblit v1.8.0