From b397edee2be2dfcc3f28eeac50298b4de26b1afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 16:53:45 +0800
Subject: [PATCH] 取水口日取水量表中,出现一些大数,明显不正确,发析系统日志,发现一些阀控器会上报一些累计流量为0的数据,且无规律,推测是其不能从水表读取到累计流量时会上报0值。如果间歇上报0值,间歇上报一些非0值,非0值减去0值,就会出现大数,一天中出现几次那么会大数进行累加,数值将更大。为此变更算法,规避这种情况,但也会丢失一些流量值。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
index b0c2a9c..472ac7f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
@@ -52,13 +52,13 @@
     left join ba_block bbk on bd.blockId = bbk.id
     where bd.deleted != 1
     <trim prefix="and" suffixOverrides="and">
-      <if test="name != null">
+      <if test="name != null and name != ''">
         bd.name like concat('%', #{name}, '%') and
       </if>
-      <if test="header != null">
+      <if test="header != null and header != ''">
         bd.header = '#{header,jdbcType=VARCHAR}' and
       </if>
-      <if test="phone != null">
+      <if test="phone != null and phone != ''">
         bd.phone = '#{phone,jdbcType=VARCHAR}' and
       </if>
       <if test="blockName != null">
@@ -81,13 +81,13 @@
     left join ba_district bdtv on bd.villageId=bdtv.id
     where bd.deleted != 1
     <trim prefix="and" suffixOverrides="and">
-      <if test="name != null">
+      <if test="name != null and name != ''">
         bd.name like concat('%', #{name}, '%') and
       </if>
-      <if test="header != null">
+      <if test="header != null and header != ''">
         bd.header = '#{header,jdbcType=VARCHAR}' and
       </if>
-      <if test="phone != null">
+      <if test="phone != null and phone != ''">
         bd.phone = '#{phone,jdbcType=VARCHAR}' and
       </if>
       <if test="blockName != null">

--
Gitblit v1.8.0