From 3b58972c757734f0dc4b1ff29a0a179ed564ab64 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 17 七月 2024 11:47:42 +0800
Subject: [PATCH] 2024-07-17 朱宝民 重构命令日志表，返回结果改为text类型
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 7a5d5f3..8f5ca51 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -239,18 +239,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>
- AND divi. deleted = 0
+ 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>
@@ -261,25 +261,32 @@
(@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>
- AND divi. deleted = 0
+ 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
--
Gitblit v1.8.0