From 1bb46d293291d41a78781d421a3b1f26075c12ab Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 八月 2024 14:49:15 +0800
Subject: [PATCH] 2024-08-08 朱宝民 统计指定年份各月用水量
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 cf6a6ca..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,7 +165,10 @@
from rm_loss_day_last rldl
Left join pr_intake pint on pint.id = rldl.intake_id
<where>
- <if test="intakeName != 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">
@@ -190,7 +193,10 @@
from rm_loss_day_last rldl
Left join pr_intake pint on pint.id = rldl.intake_id
<where>
- <if test="intakeName != 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">
@@ -200,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