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/RmIntakeAmountDayLastMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
index 0c1693a..915a04f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
@@ -173,11 +173,11 @@
     from rm_intake_amount_day_last riadl
     Left join pr_intake pint on pint.id = riadl.intake_id
     <where>
-      <if test="intakeName != null">
-        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
       </if>
-      <if test="intakeId != null">
-        and riadl.intake_id = #{intakeId}
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
         and riadl.dt &gt;= #{startDt,jdbcType=DATE}
@@ -202,11 +202,11 @@
     from rm_intake_amount_day_last riadl
     Left join pr_intake pint on pint.id = riadl.intake_id
     <where>
-      <if test="intakeName != null">
-        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
       </if>
-      <if test="intakeId != null">
-        and riadl.intake_id = #{intakeId}
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
         and riadl.dt &gt;= #{startDt,jdbcType=DATE}

--
Gitblit v1.8.0