From 4faf659ac4d1287d41d1a9afab3c302356100185 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 八月 2024 10:11:04 +0800
Subject: [PATCH] 在pipIrr-web-remote模块中实现RTU上下行数据日志下载功能RtuLogCtrl.java， 为此在pipIrr-global模块中增加了ByteArrayHttpMessageConverter.java和ByteArrayHttpMessageConverterConfig.java pipIrr-global模块的application-global.yml文件中增加了通信中间件相关URL
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 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 7275f77..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,10 +184,10 @@
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">
+ <if test="clientId != null and clientId != ''">
and rcad.client_id = #{clientId}
</if>
<if test="startDt != null">
@@ -215,10 +215,10 @@
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">
+ <if test="clientId != null and clientId != ''">
and rcad.client_id = #{clientId}
</if>
<if test="startDt != null">
--
Gitblit v1.8.0