From 84f54ef9dd4022a87c8c71648d3015d0ea51279b Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 15 八月 2024 08:36:07 +0800
Subject: [PATCH] 2024-08-15 朱宝民 添加片区（含地图图形和坐标）、分页获取片区（含地图图形和坐标）

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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 6c10de8..f1dcebb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -155,11 +155,11 @@
     from rm_loss_day rld
     Left join pr_intake pint on pint.id = rld.intake_id
     <where>
-      <if test="intakeName != null">
-        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
-      </if>
-      <if test="intakeId != null">
+      <if test="intakeId != null and intakeId != '' ">
         and rash.intake_id = #{intakeId}
+      </if>
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
@@ -183,11 +183,11 @@
     from rm_loss_day rld
     Left join pr_intake pint on pint.id = rld.intake_id
     <where>
-      <if test="intakeName != null">
-        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
-      </if>
-      <if test="intakeId != null">
+      <if test="intakeId != null and intakeId != '' ">
         and rash.intake_id = #{intakeId}
+      </if>
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
@@ -196,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