From ecef3df4890be54c1da2a8a4fc1c8c1f50f1c263 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 07 四月 2025 15:41:47 +0800 Subject: [PATCH] 式样代码管理 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 63 ++++++++++++++++++++++++++----- 1 files changed, 52 insertions(+), 11 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 91c62a2..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 @@ -239,12 +271,12 @@ COUNT(*) AS recordCount FROM pr_divide divi INNER JOIN ba_block blo ON divi.blockId = blo.id - INNER JOIN ba_district country ON divi.countyId = country.id - INNER JOIN ba_district town ON divi.townId = town.id - INNER JOIN ba_district village ON divi.villageid = village.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> - AND divi. deleted = 0 + divi. deleted = 0 <if test = "divideName != null and divideName !=''"> AND divi.name LIKE CONCAT('%',#{divideName},'%') </if> @@ -275,17 +307,17 @@ divi.operateDt FROM pr_divide divi INNER JOIN ba_block blo ON divi.blockId = blo.id - INNER JOIN ba_district country ON divi.countyId = country.id - INNER JOIN ba_district town ON divi.townId = town.id - INNER JOIN ba_district village ON divi.villageid = village.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> - AND divi. deleted = 0 + divi. deleted = 0 <if test = "divideName != null and divideName !=''"> AND divi.name LIKE CONCAT('%',#{divideName},'%') </if> - <if test = "blockId != null"> + <if test = "blockId != null and blockId !=''"> AND divi.blockId = #{blockId} </if> </where> @@ -302,14 +334,23 @@ update pr_divide set deleted = 1 <where> <if test = "id != null and id > 0"> - AND id = ${id} + AND id = #{id} </if> </where> </update> <!--鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�--> <select id="getBlockIdById" resultType="java.lang.Long"> - SELECT blockId FROM pr_divide WHERE id = ${divideId} + SELECT blockId FROM pr_divide WHERE id = #{divideId} + </select> + + <!--鏍规嵁鐗囧尯ID鑾峰彇鍒嗘按鎴垮垪琛�--> + <select id="getDividesByBlockId" resultType="com.dy.pipIrrGlobal.voPr.VoSimpleDivide"> + SELECT + id As value, + name AS label + FROM pr_divide + WHERE deleted = 0 AND blockId = #{blockId} </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0