From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug（新生成了记录，应该是更新老记录），修改之 ； 2、CommonV1_0_0中获取开关阀类型名称时，对于null返回空字符串。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 cc13cf9..c295ea9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -161,6 +161,9 @@
<if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="lossAmountGreaterOrEqual != null ">
+ and rld.loss_amount >= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+ </if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -189,6 +192,9 @@
<if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="lossAmountGreaterOrEqual != null ">
+ and rld.loss_amount >= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
+ </if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -196,10 +202,7 @@
and rld.dt <= #{endDt,jdbcType=DATE}
</if>
</where>
- ORDER BY rld.dt DESC , rld.loss_amount DESC
-<!-- <if test="pageCurr != null and pageSize != null">-->
-<!-- LIMIT {(pageCurr-1)*pageSize}, ${pageSize}-->
-<!-- </if>-->
+ ORDER BY rld.id 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