From 6fa8408c8133e8c9aee2bbcdec37bf95c20951c0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 07 二月 2025 15:39:16 +0800
Subject: [PATCH] 涉嫌偷水功能增加查询条件用水时长，修改sql语句
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 99 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 84 insertions(+), 15 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 d9b4ac4..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
@@ -227,8 +259,9 @@
lat = #{lat,jdbcType=DOUBLE},
remarks = #{remarks,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
- deleted = #{deleted,jdbcType=TINYINT}
+ operateDt = #{operatedt,jdbcType=TIMESTAMP}
+<!-- ,-->
+<!-- deleted = #{deleted,jdbcType=TINYINT}-->
where id = #{id,jdbcType=BIGINT}
</update>
@@ -238,17 +271,18 @@
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>
+ divi. deleted = 0
<if test = "divideName != null and divideName !=''">
AND divi.name LIKE CONCAT('%',#{divideName},'%')
</if>
- <if test = "blockName != null and blockName !=''">
- AND blo.name = #{blockName}
+ <if test = "blockId != null and blockId !=''">
+ AND divi.blockId = #{blockId}
</if>
</where>
</select>
@@ -257,31 +291,66 @@
<select id="getDivides" resultType="com.dy.pipIrrGlobal.voPr.VoDivide">
SELECT
(@i:=@i+1) AS id,
+ CAST(divi.id AS char) AS divideId,
divi.name AS divideName,
+ CAST(divi.blockId AS char) AS blockId,
blo.`name` AS blockName,
divi.header,
+ divi.villages,
+ divi.area,
+ divi.lng,
+ divi.lat,
divi.phone,
+ divi.remarks,
CONCAT(country.`name`, town.`name`, village.`name`) AS address,
+ CAST(divi.operator AS char) AS operator,
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>
+ divi. deleted = 0
<if test = "divideName != null and divideName !=''">
AND divi.name LIKE CONCAT('%',#{divideName},'%')
</if>
- <if test = "blockName != null and blockName !=''">
- AND blo.name = #{blockName}
+ <if test = "blockId != null and blockId !=''">
+ AND divi.blockId = #{blockId}
</if>
</where>
ORDER BY divi.operateDt DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+ <!--鏍规嵁鍒嗘按鎴縄D閫昏緫鍒犻櫎鍒嗘按鎴�-->
+ <update id="deleteDivideById" parameterType="java.lang.Long">
+ update pr_divide set deleted = 1
+ <where>
+ <if test = "id != null and id > 0">
+ AND id = #{id}
+ </if>
+ </where>
+ </update>
+
+ <!--鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�-->
+ <select id="getBlockIdById" resultType="java.lang.Long">
+ 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