From 113e9363391f863d46d5667f8346e3708a6ff3cf Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 31 七月 2024 19:09:49 +0800
Subject: [PATCH] 1、完善代码； 2、通信中间件对报警的取水口间隔发送消息改为独立任务完成。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
index dab83eb..8a7c937 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
@@ -202,6 +202,9 @@
FROM rm_on_hour_report_history oh
INNER JOIN pr_intake inta ON inta.id = oh.intake_id
<where>
+ <if test="intakeId != null and intakeId >0">
+ AND oh.intake_id = #{intakeId}
+ </if>
<if test = "intakeName != null and intakeName !=''">
AND inta.name LIKE CONCAT('%',#{intakeName},'%')
</if>
@@ -231,6 +234,9 @@
FROM rm_on_hour_report_history oh
INNER JOIN pr_intake inta ON inta.id = oh.intake_id
<where>
+ <if test="intakeId != null and intakeId >0">
+ AND oh.intake_id = #{intakeId}
+ </if>
<if test = "intakeNum != null and intakeNum !=''">
AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
</if>
@@ -248,4 +254,5 @@
</if>
</trim>
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0