From a700bf4e6423e3ad9cbf5119eb46defad84c76b3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 14 十一月 2024 13:46:51 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 3735f0e..ff89d88 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
@@ -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