From 540b3f4dbfd9eaed86b5f843be12a06b912de5ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 11 六月 2024 20:11:34 +0800
Subject: [PATCH] 1、完善靳总协议的控制器报警及状态处理； 2、报警及状态数据库表（最新+历史）增加字段电池电压报警、阀门报警。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 6 ++----
1 files changed, 2 insertions(+), 4 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 fa997e8..c0f940b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -168,10 +168,9 @@
SELECT
COUNT(*) AS recordCount
FROM pr_controller con
- INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
+ LEFT JOIN pr_intake_controller ic ON ic.controllerId = con.id
INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
- AND ic.operateType = 1
AND con.deleted = 0
<if test = "id != null and id > 0">
@@ -198,10 +197,9 @@
(SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
con.findDt AS findDt
FROM pr_controller con
- INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
+ LEFT JOIN pr_intake_controller ic ON ic.controllerId = con.id
INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
- AND ic.operateType = 1
AND con.deleted = 0
<if test = "id != null and id > 0">
--
Gitblit v1.8.0