From d65cc4cd967d9c8cbdc8a4dd7c803e952f01098f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 14:53:35 +0800
Subject: [PATCH] 修改用户登录接口 优化取水口绑定、解绑控制器接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 23 +++++++++++++++++------
1 files changed, 17 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 cbd6149..cc13cf9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -155,7 +155,10 @@
from rm_loss_day rld
Left join pr_intake pint on pint.id = rld.intake_id
<where>
- <if test="intakeName != null">
+ <if test="intakeId != null and intakeId != '' ">
+ and rld.intake_id = #{intakeId}
+ </if>
+ <if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="startDt != null">
@@ -180,7 +183,10 @@
from rm_loss_day rld
Left join pr_intake pint on pint.id = rld.intake_id
<where>
- <if test="intakeName != null">
+ <if test="intakeId != null and intakeId != '' ">
+ and rld.intake_id = #{intakeId}
+ </if>
+ <if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="startDt != null">
@@ -190,10 +196,15 @@
and rld.dt <= #{endDt,jdbcType=DATE}
</if>
</where>
- ORDER BY rld.id DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
- </if>
+ ORDER BY rld.dt DESC , rld.loss_amount DESC
+<!-- <if test="pageCurr != null and pageSize != null">-->
+<!-- LIMIT {(pageCurr-1)*pageSize}, ${pageSize}-->
+<!-- </if>-->
+ <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