From 3fe912a1d0ceca7cd0281e26b798b55b539ec2cd Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 15 十月 2024 15:19:56 +0800 Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑,对于当天发现的控制器,控制器计算的漏损量一定不正确,强制设置成0; --- 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