From f03453071fc641c9e459b4b0d767cb2acac4c13a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 14:01:27 +0800
Subject: [PATCH] 根据表阀一体机协议上行数据,实现漏损日统计、取水口用水日统计、IC卡剩余金额同步设置、农户用水日统计

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml |    8 +++-----
 1 files changed, 3 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 73fcad0..01b3bcf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -55,16 +55,14 @@
         con.rtuAddr,
         con.protocol
         FROM pr_intake ge
-        INNER JOIN pr_divide divi ON ge.divideId = divi.id
-        INNER JOIN ba_block blo ON divi.blockId = blo.id
+        LEFT JOIN pr_divide divi ON ge.divideId = divi.id
+        LEFT JOIN ba_block blo ON divi.blockId = blo.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
-        INNER JOIN pr_controller con ON con.intakeId = ge.id
+        LEFT JOIN pr_controller con ON con.intakeId = ge.id
         where ge.id = #{id,jdbcType=BIGINT}
         AND ge.deleted = 0
-        AND divi.deleted = 0
-        AND blo.deleted = 0
     </select>
 
     <delete id="deleteLogicById" parameterType="java.lang.Long">

--
Gitblit v1.8.0