From a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 一月 2025 16:40:32 +0800
Subject: [PATCH] 1、取水口用水日统计表中增加金额、次数字段; 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指定值的取水口”、“指定时间段内消费金额超过指定值的取水口”几个统计查询; 3、改“指定时间段内用水时长超过指定值的取水口”为“指定时间段内用水次数超过指定值的取水口”

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 d950234..ff89d88 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
@@ -200,12 +200,12 @@
     SELECT
         COUNT(*) AS recordCount
     FROM rm_on_hour_report_history oh
-    INNER JOIN pr_intake inta ON inta.id = oh.intake_id
+        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 intakeNum !=''">
+      <if test = "intakeNum != null and intakeNum !=''">
         AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
       </if>
       <if test = "rtuAddr != null and rtuAddr !=''">
@@ -235,16 +235,16 @@
         INNER JOIN pr_intake inta ON inta.id = oh.intake_id
     <where>
       <if test="intakeId != null and intakeId >0">
-        AND oh.intake_id = #{intakeId}
+        AND oh.intake_id = #{intakeId,jdbcType=BIGINT}
       </if>
       <if test = "intakeNum != null and intakeNum !=''">
-        AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
+        AND inta.name LIKE CONCAT('%',#{intakeNum,jdbcType=VARCHAR},'%')
       </if>
       <if test = "rtuAddr != null and rtuAddr !=''">
-        AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
+        AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr,jdbcType=VARCHAR},'%')
       </if>
       <if test = "timeStart != null and timeStop != null">
-        AND oh.dt BETWEEN #{timeStart} AND #{timeStop}
+        AND oh.dt BETWEEN #{timeStart,jdbcType=INTEGER} AND #{timeStop,jdbcType=INTEGER}
       </if>
     </where>
     ORDER BY oh.dt DESC

--
Gitblit v1.8.0