From d6bc4983c4b435f09f62d978ad3facfa2c337ad1 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 09 五月 2024 20:02:21 +0800
Subject: [PATCH] 添加修改绑定记录通过取水口接口 修改添加控制器接口 修改取水口流浪控制器绑定接口 修改根据控制器编号获取绑定记录列表
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 22 +++++++++++-----------
1 files changed, 11 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 a33f952..8f5ca51 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -238,13 +238,13 @@
SELECT
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
+ 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>
- AND divi. deleted = 0
+ divi. deleted = 0
<if test = "divideName != null and divideName !=''">
AND divi.name LIKE CONCAT('%',#{divideName},'%')
</if>
@@ -262,7 +262,7 @@
CAST(divi.id AS char) AS divideId,
divi.name AS divideName,
CAST(divi.blockId AS char) AS blockId,
-<!-- blo.`name` AS blockName,-->
+ blo.`name` AS blockName,
divi.header,
divi.villages,
divi.area,
@@ -274,13 +274,13 @@
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
+ 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>
- AND divi. deleted = 0
+ divi. deleted = 0
<if test = "divideName != null and divideName !=''">
AND divi.name LIKE CONCAT('%',#{divideName},'%')
</if>
--
Gitblit v1.8.0