From ca0c6f8612c7c934e64ca997902715016b796455 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 09 八月 2024 15:40:38 +0800
Subject: [PATCH] 2024-08-09 朱宝民 统计指定月份各农户各天用水量及消费金额、统计指定年份各农户各月用水量及消费金额

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
index be493a4..0f4282c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -255,6 +255,9 @@
       LEFT JOIN se_client cli ON cli.id = his.operator
       LEFT JOIN ba_user  user ON user.id = his.operator
     <where>
+      <if test="intakeId != null">
+        AND his.intake_id = #{intakeId}
+      </if>
       <if test = "commandName != null and commandName !=''">
         AND his.command_name LIKE CONCAT('%',#{commandName},'%')
       </if>
@@ -288,6 +291,9 @@
         LEFT JOIN se_client cli ON cli.id = his.operator
         LEFT JOIN ba_user  user ON user.id = his.operator
     <where>
+      <if test="intakeId != null">
+        AND his.intake_id = #{intakeId}
+      </if>
       <if test = "commandName != null and commandName !=''">
         AND his.command_name LIKE CONCAT('%',#{commandName},'%')
       </if>

--
Gitblit v1.8.0