From 6dacac48ebb596797dfd8e5bf3a803ed0b583643 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 17:11:31 +0800
Subject: [PATCH] 取水口综合信息-统计数据逻辑处理模块完善

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
index f70b447..db01039 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -181,6 +181,9 @@
             <if test="intakeName != null and intakeName != ''">
                 and pint.name like CONCAT('%', #{intakeName,jdbcType=VARCHAR}, '%')
             </if>
+            <if test="lossAmountGreaterOrEqual != null ">
+                and rldl.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+            </if>
             <if test="startDt != null">
                 and rldl.dt &gt;= #{startDt,jdbcType=DATE}
             </if>
@@ -208,6 +211,9 @@
             <if test="intakeName != null and intakeName != ''">
                 and pint.name like CONCAT('%', #{intakeName,jdbcType=VARCHAR}, '%')
             </if>
+            <if test="lossAmountGreaterOrEqual != null ">
+                and rldl.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+            </if>
             <if test="startDt != null">
                 and rldl.dt &gt;= #{startDt,jdbcType=DATE}
             </if>
@@ -215,10 +221,7 @@
                 and rldl.dt &lt;= #{endDt,jdbcType=DATE}
             </if>
         </where>
-        ORDER BY rldl.dt DESC, rldl.loss_amount DESC
-        <!--    <if test="pageCurr != null and pageSize != null">-->
-        <!--      LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}-->
-        <!--    </if>-->
+        ORDER BY rldl.dt_last DESC
         <trim prefix="limit ">
             <if test="start != null and count != null">
                 #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}

--
Gitblit v1.8.0