From 74b4dd5220a5f9ddef7cb87d79adf5a8c8876630 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 09 十二月 2024 15:21:36 +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 |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 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 f1dcebb..c295ea9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -156,10 +156,13 @@
     Left join pr_intake pint on pint.id = rld.intake_id
     <where>
       <if test="intakeId != null and intakeId != '' ">
-        and rash.intake_id = #{intakeId}
+        and rld.intake_id = #{intakeId}
       </if>
       <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}
@@ -184,10 +187,13 @@
     Left join pr_intake pint on pint.id = rld.intake_id
     <where>
       <if test="intakeId != null and intakeId != '' ">
-        and rash.intake_id = #{intakeId}
+        and rld.intake_id = #{intakeId}
       </if>
       <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}
@@ -196,10 +202,12 @@
         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}
+      </if>
+    </trim>
   </select>
 
   <select id="statisticsByIntake" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeLossStatistics">

--
Gitblit v1.8.0