From beca4894acec49f29f7283f3c76c8da5e1c9bfe8 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 01 八月 2024 08:48:35 +0800
Subject: [PATCH] 获取全部取水口（在线不在线）接口增加查询条件是否绑定控制器，分页查询默认返回10条

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 cbd6149..bdf5d9a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -158,6 +158,9 @@
       <if test="intakeName != null">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
+      <if test="intakeId != null">
+        and rld.intake_id = #{intakeId}
+      </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
@@ -183,6 +186,9 @@
       <if test="intakeName != null">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
+      <if test="intakeId != null">
+        and rld.intake_id = #{intakeId}
+      </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
       </if>
@@ -190,7 +196,7 @@
         and rld.dt &lt;= #{endDt,jdbcType=DATE}
       </if>
     </where>
-    ORDER BY rld.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