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 |   26 +++++++++++++++++---------
 1 files changed, 17 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..c295ea9 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,14 @@
     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="intakeId != null">
-        and rash.intake_id = #{intakeId}
+      <if test="lossAmountGreaterOrEqual != null ">
+        and rld.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
       </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
@@ -183,11 +186,14 @@
     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="intakeId != null">
-        and rash.intake_id = #{intakeId}
+      <if test="lossAmountGreaterOrEqual != null ">
+        and rld.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
       </if>
       <if test="startDt != null">
         and rld.dt &gt;= #{startDt,jdbcType=DATE}
@@ -197,9 +203,11 @@
       </if>
     </where>
     ORDER BY rld.id 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