From b306ba3d75769c7d3f5ae9f7b43a8aaa26ed983c Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 08 八月 2024 16:15:40 +0800
Subject: [PATCH] 当前余额总量
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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..fab983b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -165,11 +165,11 @@
from rm_loss_day_last rldl
Left join pr_intake pint on pint.id = rldl.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 rldl.dt >= #{startDt,jdbcType=DATE}
@@ -193,11 +193,11 @@
from rm_loss_day_last rldl
Left join pr_intake pint on pint.id = rldl.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 rldl.dt >= #{startDt,jdbcType=DATE}
@@ -206,7 +206,7 @@
and rldl.dt <= #{endDt,jdbcType=DATE}
</if>
</where>
- ORDER BY rldl.id DESC
+ ORDER BY rldl.dt DESC , rldl.loss_amount DESC
<if test="pageCurr != null and pageSize != null">
LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
</if>
--
Gitblit v1.8.0