From 8c4a723ff13e34152934b84c52267615c4e0fb8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 06 十二月 2024 10:22:34 +0800
Subject: [PATCH] 升级模拟器增加上报81数据，为上报阀门状态，用81数据代替心跳
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
index e2cbdd6..0c43003 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -184,8 +184,11 @@
from rm_client_amount_day rcad
Left join se_client sc on sc.id = rcad.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 rcad.dt >= #{startDt,jdbcType=DATE}
@@ -212,9 +215,12 @@
from rm_client_amount_day rcad
Left join se_client sc on sc.id = rcad.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 rcad.dt >= #{startDt,jdbcType=DATE}
</if>
--
Gitblit v1.8.0