From 113e9363391f863d46d5667f8346e3708a6ff3cf Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 31 七月 2024 19:09:49 +0800
Subject: [PATCH] 1、完善代码; 2、通信中间件对报警的取水口间隔发送消息改为独立任务完成。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 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 972b0df..f3dfb90 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -169,7 +169,7 @@
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="intakeId != null">
-        and rash.intake_id = #{intakeId}
+        and rldl.intake_id = #{intakeId}
       </if>
       <if test="startDt != null">
         and rldl.dt &gt;= #{startDt,jdbcType=DATE}
@@ -197,7 +197,7 @@
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="intakeId != null">
-        and rash.intake_id = #{intakeId}
+        and rldl.intake_id = #{intakeId}
       </if>
       <if test="startDt != null">
         and rldl.dt &gt;= #{startDt,jdbcType=DATE}
@@ -206,7 +206,7 @@
         and rldl.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
-    ORDER BY rldl.id DESC
+    ORDER BY rld.dt DESC , rld.loss_amount DESC
     <if test="pageCurr != null and pageSize != null">
       LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
     </if>

--
Gitblit v1.8.0