From 7221352ba76f0841cd9c93cc8d57c2b233c5d6fe Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 21:23:02 +0800
Subject: [PATCH] 2024-10-28 营销模块获取农户数据接口,筛选条件增加水卡编号

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 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 cf670a7..9f98c8b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -217,7 +217,7 @@
         con.protocol,
         inta.remarks,
         rtus.isOnLine,
-        (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
+        (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND operateType = 1) AS bindNumber,
         con.findDt AS findDt
     FROM pr_controller con
         LEFT JOIN pr_intake_controller ic ON ic.controllerId = con.id
@@ -243,7 +243,7 @@
         AND rtus.isOnLine = #{isOnLine}
       </if>
       <if test = "bindNumber != null and bindNumber > 0">
-        AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) = ${bindNumber}
+        AND (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND operateType = 1) = ${bindNumber}
       </if>
     </where>
     ORDER BY con.operateDt DESC
@@ -265,6 +265,7 @@
     tb.rtuAddr rtuAddr,
     tb.intakeId intakeId,
     tb.findDt findDt,
+    tb.operateDt operateDt,
     itb.name intakeName
     FROM pr_controller tb
     INNER JOIN pr_intake itb on tb.intakeId = itb.id

--
Gitblit v1.8.0