From f6962c0ede2f18b8aaeaf69f84b39d459a5a59f4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 八月 2024 13:41:12 +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 | 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 >= #{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 >= #{startDt,jdbcType=DATE}
@@ -196,7 +196,7 @@
and rld.dt <= #{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