From c9a3644b14e1307addeadea23cb5c2f5b2d8b28f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 12 六月 2024 09:45:02 +0800
Subject: [PATCH] 1、完善通信中间件TkFindP206V1_0_0类和log4j2.yml代码； 2、删除common模块中的HttpUtil类（用不到了）； 3、实现P206V1_0_0协议的功能码99H和A0H的上下行数据解析。
---
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