From 156fd9f67912e73b46c02ffe325ea24f21b47720 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 11:55:16 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index cc13cf9..c295ea9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -161,6 +161,9 @@
       <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
+      <if test="lossAmountGreaterOrEqual != null ">
+        and rld.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+      </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
@@ -189,6 +192,9 @@
       <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
+      <if test="lossAmountGreaterOrEqual != null ">
+        and rld.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+      </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
@@ -196,10 +202,7 @@
         and rld.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
-    ORDER BY rld.dt DESC , rld.loss_amount DESC
-<!--    <if test="pageCurr != null and pageSize != null">-->
-<!--      LIMIT {(pageCurr-1)*pageSize}, ${pageSize}-->
-<!--    </if>-->
+    ORDER BY rld.id 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