From b16bb22a803b1ec2960822f08b30503a732ab3af Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 八月 2024 10:10:09 +0800
Subject: [PATCH] 通信中间件实现上行数据任务:恢复虚拟卡在取水口上占用状态为非占用状态

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
index f674e37..2e25990 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -194,8 +194,11 @@
     from rm_client_amount_day_last rcadl
     Left join se_client sc on sc.id = rcadl.client_id
     <where>
-      <if test="clientName != null">
+      <if test="clientName != null and clientName != '' ">
         and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
+      </if>
+      <if test="clientId != null and clientId != ''">
+        and rcad.client_id = #{clientId}
       </if>
       <if test="startDt != null">
         and rcadl.dt &gt;= #{startDt,jdbcType=DATE}
@@ -222,9 +225,12 @@
     from rm_client_amount_day_last rcadl
     Left join se_client sc on sc.id = rcadl.client_id
     <where>
-      <if test="clientName != null">
+      <if test="clientName != null and clientName != '' ">
         and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
       </if>
+      <if test="clientId != null and clientId != ''">
+        and rcad.client_id = #{clientId}
+      </if>
       <if test="startDt != null">
         and rcadl.dt &gt;= #{startDt,jdbcType=DATE}
       </if>

--
Gitblit v1.8.0