From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:35:16 +0800
Subject: [PATCH] Revert "1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。"

---
 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