From 156fd9f67912e73b46c02ffe325ea24f21b47720 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 11:55:16 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
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 >= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+ </if>
<if test="startDt != null">
and rldl.dt >= #{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 >= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+ </if>
<if test="startDt != null">
and rldl.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -215,10 +221,7 @@
and rldl.dt <= #{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