From 03caef0034cbb339ae02a378db786d1a5360dc52 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 12 三月 2024 16:58:59 +0800
Subject: [PATCH] 2024-03-12 朱宝民 根据取水口编号获取绑定记录、根据条件获取控制器
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml | 3 ++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index f139fd2..c0567a0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -172,7 +172,7 @@
INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
AND ic.operateType = 1
- AND deleted = 0
+ AND con.deleted = 0
<if test = "id != null and id > 0">
AND con.id = ${id}
@@ -200,7 +200,7 @@
INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
AND ic.operateType = 1
- AND deleted = 0
+ AND con.deleted = 0
<if test = "id != null and id > 0">
AND con.id = ${id}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
index df62638..9e87a44 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
@@ -150,7 +150,8 @@
<select id="getBindsByIntakeId" resultType="java.util.Map">
SELECT
user.name AS userName,
- con.code AS controllerCode,
+ <!--con.code AS controllerCode,-->
+ con.rtuAddr,
(CASE
WHEN ic.operateType = 1 THEN "缁戝畾"
WHEN ic.operateType = 2 THEN "瑙ｇ粦"
--
Gitblit v1.8.0