From 3087ff4ccc174d5952e9650ac3fae61eff477554 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 01 四月 2024 10:42:55 +0800
Subject: [PATCH] 修改 流量计实体增加监测站ID外键和驼峰命名 流量计监测站绑定接口（同步修改流量计的监测站ID外键 和 绑定记录表） 流量计监测站解绑接口（同步修改流量计的监测站ID外键 和 绑定记录表） 条件查询监测站（绑定状态判定） 条件查询已绑定的流量计 回退误修改的获取绑定记录
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 8bc0254..8470ae2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -216,9 +216,9 @@
FROM pr_intake ge
INNER JOIN pr_divide divi ON ge.divideId = divi.id
INNER JOIN ba_block blo ON divi.blockId = blo.id
- INNER JOIN ba_district country ON ge.countyId = country.id
- INNER JOIN ba_district town ON ge.townId = town.id
- INNER JOIN ba_district village ON ge.villageId = village.id
+ LEFT JOIN ba_district country ON ge.countyId = country.id
+ LEFT JOIN ba_district town ON ge.townId = town.id
+ LEFT JOIN ba_district village ON ge.villageId = village.id
<where>
ge.deleted = 0
AND divi.deleted = 0
@@ -232,7 +232,7 @@
</if>
<if test="blockName != null and blockName != ''">
- AND blo.name = #{blockName}
+ AND blo.name LIKE CONCAT('%', #{blockName}, '%')
</if>
<if test="isBinded == 0">
@@ -281,7 +281,7 @@
</if>
<if test="blockName != null and blockName != ''">
- AND blo.name = #{blockName}
+ AND blo.name LIKE CONCAT('%', #{blockName}, '%')
</if>
<if test="isBinded == 0">
--
Gitblit v1.8.0